changeset 7298:b69e27387f74

6733918 Teamware has retired, please welcome your new manager, Mercurial 4758439 some files use "current date" sccs keywords 6560843 asm sources should not rely on .file "%M%" for naming STT_FILE symbols 6560958 Solaris:: perl modules should not use SCCS keywords in version information 6729074 webrev doesn't deal well with remote ssh hg parents
author Mark J. Nelson <Mark.J.Nelson@Sun.COM>
date Wed, 06 Aug 2008 16:29:39 -0600
parents e4b614b9dc04
children d9a056040774
files .hgignore usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveProjectModel.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveUserModel.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/DataModel.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessAggregateDataModel.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessDataModel.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ResourceMonitor.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProvider.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderDataModel.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderProperties.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SetProp.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProject.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProjectProcessAggregateStatistics.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUser.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUserProcessAggregateStatistics.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformation.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformationProperties.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatistics.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProjectProcessAggregateStatisticalInformation.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_UserProcessAggregateStatisticalInformation.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SystemDataModel.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Util.java usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/rmon.java usr/src/common/atomic/amd64/atomic.s usr/src/common/atomic/i386/atomic.s usr/src/common/atomic/sparc/atomic.s usr/src/common/atomic/sparcv9/atomic.s usr/src/lib/c_synonyms/amd64/synonyms.s usr/src/lib/c_synonyms/i386/synonyms.s usr/src/lib/c_synonyms/sparc/synonyms.s usr/src/lib/c_synonyms/sparcv9/synonyms.s usr/src/lib/common/amd64/crti.s usr/src/lib/common/amd64/crtn.s usr/src/lib/common/i386/crt1.s usr/src/lib/common/sparcv9/crti.s usr/src/lib/common/sparcv9/crtn.s usr/src/lib/libc/amd64/crt/cerror.s usr/src/lib/libc/amd64/fp/__xgetRD.s usr/src/lib/libc/amd64/fp/_xtoll.s usr/src/lib/libc/amd64/fp/_xtoull.s usr/src/lib/libc/amd64/fp/fpcw.s usr/src/lib/libc/amd64/gen/_getsp.s usr/src/lib/libc/amd64/gen/_stack_grow.s usr/src/lib/libc/amd64/gen/abs.s usr/src/lib/libc/amd64/gen/alloca.s usr/src/lib/libc/amd64/gen/amd64_data.s usr/src/lib/libc/amd64/gen/byteorder.s usr/src/lib/libc/amd64/gen/cache.s usr/src/lib/libc/amd64/gen/cuexit.s usr/src/lib/libc/amd64/gen/lock.s usr/src/lib/libc/amd64/gen/memccpy.s usr/src/lib/libc/amd64/gen/memchr.s usr/src/lib/libc/amd64/gen/memcmp.s usr/src/lib/libc/amd64/gen/memcpy.s usr/src/lib/libc/amd64/gen/memset.s usr/src/lib/libc/amd64/gen/proc64_support.s usr/src/lib/libc/amd64/gen/setjmp.s usr/src/lib/libc/amd64/gen/strcat.s usr/src/lib/libc/amd64/gen/strchr.s usr/src/lib/libc/amd64/gen/strcmp.s usr/src/lib/libc/amd64/gen/strcpy.s usr/src/lib/libc/amd64/gen/strlen.s usr/src/lib/libc/amd64/gen/strncat.s usr/src/lib/libc/amd64/gen/strncmp.s usr/src/lib/libc/amd64/gen/strncpy.s usr/src/lib/libc/amd64/gen/strrchr.s usr/src/lib/libc/amd64/gen/wschr.s usr/src/lib/libc/amd64/gen/wslen.s usr/src/lib/libc/amd64/gen/wsncmp.s usr/src/lib/libc/amd64/sys/__clock_gettime.s usr/src/lib/libc/amd64/sys/__getcontext.s usr/src/lib/libc/amd64/sys/__uadmin.s usr/src/lib/libc/amd64/sys/_lwp_mutex_unlock.s usr/src/lib/libc/amd64/sys/door.s usr/src/lib/libc/amd64/sys/forkallx.s usr/src/lib/libc/amd64/sys/forkx.s usr/src/lib/libc/amd64/sys/getcontext.s usr/src/lib/libc/amd64/sys/gettimeofday.s usr/src/lib/libc/amd64/sys/lwp_private.s usr/src/lib/libc/amd64/sys/pipe.s usr/src/lib/libc/amd64/sys/syscall.s usr/src/lib/libc/amd64/sys/sysi86.s usr/src/lib/libc/amd64/sys/uname.s usr/src/lib/libc/amd64/sys/vforkx.s usr/src/lib/libc/amd64/threads/asm_subr.s usr/src/lib/libc/amd64/threads/tls_get_addr.s usr/src/lib/libc/amd64/unwind/unwind_frame.s usr/src/lib/libc/common/sys/__clock_timer.s usr/src/lib/libc/common/sys/__getloadavg.s usr/src/lib/libc/common/sys/__rusagesys.s usr/src/lib/libc/common/sys/__signotify.s usr/src/lib/libc/common/sys/__sigrt.s usr/src/lib/libc/common/sys/__time.s usr/src/lib/libc/common/sys/_lgrp_home_fast.s usr/src/lib/libc/common/sys/_lgrpsys.s usr/src/lib/libc/common/sys/_nfssys.s usr/src/lib/libc/common/sys/_portfs.s usr/src/lib/libc/common/sys/_pset.s usr/src/lib/libc/common/sys/_rpcsys.s usr/src/lib/libc/common/sys/_sigaction.s usr/src/lib/libc/common/sys/_so_accept.s usr/src/lib/libc/common/sys/_so_bind.s usr/src/lib/libc/common/sys/_so_connect.s usr/src/lib/libc/common/sys/_so_getpeername.s usr/src/lib/libc/common/sys/_so_getsockname.s usr/src/lib/libc/common/sys/_so_getsockopt.s usr/src/lib/libc/common/sys/_so_listen.s usr/src/lib/libc/common/sys/_so_recv.s usr/src/lib/libc/common/sys/_so_recvfrom.s usr/src/lib/libc/common/sys/_so_recvmsg.s usr/src/lib/libc/common/sys/_so_send.s usr/src/lib/libc/common/sys/_so_sendmsg.s usr/src/lib/libc/common/sys/_so_sendto.s usr/src/lib/libc/common/sys/_so_setsockopt.s usr/src/lib/libc/common/sys/_so_shutdown.s usr/src/lib/libc/common/sys/_so_socket.s usr/src/lib/libc/common/sys/_so_socketpair.s usr/src/lib/libc/common/sys/_sockconfig.s usr/src/lib/libc/common/sys/access.s usr/src/lib/libc/common/sys/acct.s usr/src/lib/libc/common/sys/acl.s usr/src/lib/libc/common/sys/adjtime.s usr/src/lib/libc/common/sys/alarm.s usr/src/lib/libc/common/sys/brk.s usr/src/lib/libc/common/sys/chdir.s usr/src/lib/libc/common/sys/chmod.s usr/src/lib/libc/common/sys/chown.s usr/src/lib/libc/common/sys/chroot.s usr/src/lib/libc/common/sys/cladm.s usr/src/lib/libc/common/sys/close.s usr/src/lib/libc/common/sys/creat.s usr/src/lib/libc/common/sys/dup.s usr/src/lib/libc/common/sys/execve.s usr/src/lib/libc/common/sys/exit.s usr/src/lib/libc/common/sys/facl.s usr/src/lib/libc/common/sys/fchdir.s usr/src/lib/libc/common/sys/fchmod.s usr/src/lib/libc/common/sys/fchown.s usr/src/lib/libc/common/sys/fchroot.s usr/src/lib/libc/common/sys/fcntl.s usr/src/lib/libc/common/sys/fdsync.s usr/src/lib/libc/common/sys/fpathconf.s usr/src/lib/libc/common/sys/fstat.s usr/src/lib/libc/common/sys/fstatfs.s usr/src/lib/libc/common/sys/fstatvfs.s usr/src/lib/libc/common/sys/getcpuid.s usr/src/lib/libc/common/sys/getdents.s usr/src/lib/libc/common/sys/getegid.s usr/src/lib/libc/common/sys/geteuid.s usr/src/lib/libc/common/sys/getgid.s usr/src/lib/libc/common/sys/getgroups.s usr/src/lib/libc/common/sys/gethrtime.s usr/src/lib/libc/common/sys/getitimer.s usr/src/lib/libc/common/sys/getmsg.s usr/src/lib/libc/common/sys/getpid.s usr/src/lib/libc/common/sys/getpmsg.s usr/src/lib/libc/common/sys/getppid.s usr/src/lib/libc/common/sys/getrlimit.s usr/src/lib/libc/common/sys/getuid.s usr/src/lib/libc/common/sys/gtty.s usr/src/lib/libc/common/sys/install_utrap.s usr/src/lib/libc/common/sys/ioctl.s usr/src/lib/libc/common/sys/kaio.s usr/src/lib/libc/common/sys/kill.s usr/src/lib/libc/common/sys/lchown.s usr/src/lib/libc/common/sys/link.s usr/src/lib/libc/common/sys/llseek.s usr/src/lib/libc/common/sys/lseek.s usr/src/lib/libc/common/sys/lstat.s usr/src/lib/libc/common/sys/memcntl.s usr/src/lib/libc/common/sys/mincore.s usr/src/lib/libc/common/sys/mkdir.s usr/src/lib/libc/common/sys/mknod.s usr/src/lib/libc/common/sys/mmap.s usr/src/lib/libc/common/sys/modctl.s usr/src/lib/libc/common/sys/mount.s usr/src/lib/libc/common/sys/mprotect.s usr/src/lib/libc/common/sys/munmap.s usr/src/lib/libc/common/sys/nice.s usr/src/lib/libc/common/sys/ntp_adjtime.s usr/src/lib/libc/common/sys/ntp_gettime.s usr/src/lib/libc/common/sys/open.s usr/src/lib/libc/common/sys/p_online.s usr/src/lib/libc/common/sys/pathconf.s usr/src/lib/libc/common/sys/pause.s usr/src/lib/libc/common/sys/pcsample.s usr/src/lib/libc/common/sys/pollsys.s usr/src/lib/libc/common/sys/pread.s usr/src/lib/libc/common/sys/priocntlset.s usr/src/lib/libc/common/sys/processor_bind.s usr/src/lib/libc/common/sys/processor_info.s usr/src/lib/libc/common/sys/profil.s usr/src/lib/libc/common/sys/putmsg.s usr/src/lib/libc/common/sys/putpmsg.s usr/src/lib/libc/common/sys/pwrite.s usr/src/lib/libc/common/sys/read.s usr/src/lib/libc/common/sys/readlink.s usr/src/lib/libc/common/sys/readv.s usr/src/lib/libc/common/sys/rename.s usr/src/lib/libc/common/sys/resolvepath.s usr/src/lib/libc/common/sys/rmdir.s usr/src/lib/libc/common/sys/seteguid.s usr/src/lib/libc/common/sys/setgid.s usr/src/lib/libc/common/sys/setgroups.s usr/src/lib/libc/common/sys/setitimer.s usr/src/lib/libc/common/sys/setreid.s usr/src/lib/libc/common/sys/setrlimit.s usr/src/lib/libc/common/sys/setuid.s usr/src/lib/libc/common/sys/sigaltstk.s usr/src/lib/libc/common/sys/sigprocmsk.s usr/src/lib/libc/common/sys/sigsendset.s usr/src/lib/libc/common/sys/sigsuspend.s usr/src/lib/libc/common/sys/stat.s usr/src/lib/libc/common/sys/statfs.s usr/src/lib/libc/common/sys/statvfs.s usr/src/lib/libc/common/sys/stty.s usr/src/lib/libc/common/sys/symlink.s usr/src/lib/libc/common/sys/sync.s usr/src/lib/libc/common/sys/sysconfig.s usr/src/lib/libc/common/sys/sysfs.s usr/src/lib/libc/common/sys/sysinfo.s usr/src/lib/libc/common/sys/syslwp.s usr/src/lib/libc/common/sys/times.s usr/src/lib/libc/common/sys/ulimit.s usr/src/lib/libc/common/sys/umask.s usr/src/lib/libc/common/sys/umount2.s usr/src/lib/libc/common/sys/unlink.s usr/src/lib/libc/common/sys/utime.s usr/src/lib/libc/common/sys/utimes.s usr/src/lib/libc/common/sys/utssys.s usr/src/lib/libc/common/sys/uucopy.s usr/src/lib/libc/common/sys/vhangup.s usr/src/lib/libc/common/sys/waitid.s usr/src/lib/libc/common/sys/write.s usr/src/lib/libc/common/sys/writev.s usr/src/lib/libc/common/sys/yield.s usr/src/lib/libc/i386/crt/_rtboot.s usr/src/lib/libc/i386/crt/cerror.s usr/src/lib/libc/i386/crt/cerror64.s usr/src/lib/libc/i386/fp/_xtoll.s usr/src/lib/libc/i386/fp/_xtoull.s usr/src/lib/libc/i386/fp/fpcw.s usr/src/lib/libc/i386/gen/_div64.s usr/src/lib/libc/i386/gen/_divdi3.s usr/src/lib/libc/i386/gen/_getsp.s usr/src/lib/libc/i386/gen/_mul64.s usr/src/lib/libc/i386/gen/_stack_grow.s usr/src/lib/libc/i386/gen/abs.s usr/src/lib/libc/i386/gen/alloca.s usr/src/lib/libc/i386/gen/byteorder.s usr/src/lib/libc/i386/gen/cuexit.s usr/src/lib/libc/i386/gen/ladd.s usr/src/lib/libc/i386/gen/ldivide.s usr/src/lib/libc/i386/gen/lmul.s usr/src/lib/libc/i386/gen/lock.s usr/src/lib/libc/i386/gen/lshiftl.s usr/src/lib/libc/i386/gen/lsign.s usr/src/lib/libc/i386/gen/lsub.s usr/src/lib/libc/i386/gen/memccpy.s usr/src/lib/libc/i386/gen/memchr.s usr/src/lib/libc/i386/gen/memcmp.s usr/src/lib/libc/i386/gen/memcpy.s usr/src/lib/libc/i386/gen/memset.s usr/src/lib/libc/i386/gen/setjmp.s usr/src/lib/libc/i386/gen/strcat.s usr/src/lib/libc/i386/gen/strchr.s usr/src/lib/libc/i386/gen/strcpy.s usr/src/lib/libc/i386/gen/strlen.s usr/src/lib/libc/i386/gen/strncat.s usr/src/lib/libc/i386/gen/strncmp.s usr/src/lib/libc/i386/gen/strncpy.s usr/src/lib/libc/i386/gen/strrchr.s usr/src/lib/libc/i386/gen/wschr.s usr/src/lib/libc/i386/gen/wslen.s usr/src/lib/libc/i386/gen/wsncmp.s usr/src/lib/libc/i386/sys/__clock_gettime.s usr/src/lib/libc/i386/sys/__getcontext.s usr/src/lib/libc/i386/sys/__uadmin.s usr/src/lib/libc/i386/sys/_lwp_mutex_unlock.s usr/src/lib/libc/i386/sys/door.s usr/src/lib/libc/i386/sys/forkallx.s usr/src/lib/libc/i386/sys/forkx.s usr/src/lib/libc/i386/sys/fxstat.s usr/src/lib/libc/i386/sys/getcontext.s usr/src/lib/libc/i386/sys/gettimeofday.s usr/src/lib/libc/i386/sys/lwp_private.s usr/src/lib/libc/i386/sys/lxstat.s usr/src/lib/libc/i386/sys/nuname.s usr/src/lib/libc/i386/sys/pipe.s usr/src/lib/libc/i386/sys/syscall.s usr/src/lib/libc/i386/sys/sysi86.s usr/src/lib/libc/i386/sys/uname.s usr/src/lib/libc/i386/sys/vforkx.s usr/src/lib/libc/i386/sys/xmknod.s usr/src/lib/libc/i386/sys/xstat.s usr/src/lib/libc/i386/threads/asm_subr.s usr/src/lib/libc/i386/threads/tls_get_addr.s usr/src/lib/libc/i386/unwind/unwind_frame.s usr/src/lib/libc/i386_hwcap1/gen/memcpy.s usr/src/lib/libc/i386_hwcap1/gen/memset.s usr/src/lib/libc/sparc/crt/hwmuldiv.s usr/src/lib/libc/sparc/fp/_Q_get_rp_rd.s usr/src/lib/libc/sparc/fp/fpgetmask.s usr/src/lib/libc/sparc/fp/fpgetrnd.s usr/src/lib/libc/sparc/fp/fpgetsticky.s usr/src/lib/libc/sparc/fp/fpsetmask.s usr/src/lib/libc/sparc/fp/fpsetrnd.s usr/src/lib/libc/sparc/fp/fpsetsticky.s usr/src/lib/libc/sparc/gen/_stack_grow.s usr/src/lib/libc/sparc/gen/ladd.s usr/src/lib/libc/sparc/gen/lock.s usr/src/lib/libc/sparc/gen/lshiftl.s usr/src/lib/libc/sparc/gen/lsign.s usr/src/lib/libc/sparc/gen/lsub.s usr/src/lib/libc/sparc/gen/memchr.s usr/src/lib/libc/sparc/gen/memcmp.s usr/src/lib/libc/sparc/gen/memcpy.s usr/src/lib/libc/sparc/gen/memmove.s usr/src/lib/libc/sparc/gen/memset.s usr/src/lib/libc/sparc/gen/setjmp.s usr/src/lib/libc/sparc/gen/strcasecmp.s usr/src/lib/libc/sparc/gen/strchr.s usr/src/lib/libc/sparc/gen/strcmp.s usr/src/lib/libc/sparc/gen/strcpy.s usr/src/lib/libc/sparc/gen/strlcpy.s usr/src/lib/libc/sparc/gen/strlen.s usr/src/lib/libc/sparc/gen/strncmp.s usr/src/lib/libc/sparc/gen/strncpy.s usr/src/lib/libc/sparc/gen/sync_instruction_memory.s usr/src/lib/libc/sparc/sys/__clock_gettime.s usr/src/lib/libc/sparc/sys/__getcontext.s usr/src/lib/libc/sparc/sys/_lwp_mutex_unlock.s usr/src/lib/libc/sparc/sys/door.s usr/src/lib/libc/sparc/sys/forkallx.s usr/src/lib/libc/sparc/sys/forkx.s usr/src/lib/libc/sparc/sys/gettimeofday.s usr/src/lib/libc/sparc/sys/syscall.s usr/src/lib/libc/sparc/sys/vforkx.s usr/src/lib/libc/sparc/threads/asm_subr.s usr/src/lib/libc/sparc/threads/tls_get_addr.s usr/src/lib/libc/sparc/unwind/unwind_frame.s usr/src/lib/libc/sparcv9/crt/__align_cpy_2.s usr/src/lib/libc/sparcv9/crt/__align_cpy_4.s usr/src/lib/libc/sparcv9/crt/__align_cpy_8.s usr/src/lib/libc/sparcv9/crt/cerror.s usr/src/lib/libc/sparcv9/fp/_Q_get_rp_rd.s usr/src/lib/libc/sparcv9/fp/fpgetmask.s usr/src/lib/libc/sparcv9/fp/fpgetrnd.s usr/src/lib/libc/sparcv9/fp/fpgetsticky.s usr/src/lib/libc/sparcv9/fp/fpsetmask.s usr/src/lib/libc/sparcv9/fp/fpsetrnd.s usr/src/lib/libc/sparcv9/fp/fpsetsticky.s usr/src/lib/libc/sparcv9/gen/abs.s usr/src/lib/libc/sparcv9/gen/alloca.s usr/src/lib/libc/sparcv9/gen/memchr.s usr/src/lib/libc/sparcv9/gen/memcmp.s usr/src/lib/libc/sparcv9/gen/memcpy.s usr/src/lib/libc/sparcv9/gen/memmove.s usr/src/lib/libc/sparcv9/gen/memset.s usr/src/lib/libc/sparcv9/gen/setjmp.s usr/src/lib/libc/sparcv9/gen/strcasecmp.s usr/src/lib/libc/sparcv9/gen/strchr.s usr/src/lib/libc/sparcv9/gen/strcmp.s usr/src/lib/libc/sparcv9/gen/strcpy.s usr/src/lib/libc/sparcv9/gen/strlcpy.s usr/src/lib/libc/sparcv9/gen/strlen.s usr/src/lib/libc/sparcv9/gen/strncmp.s usr/src/lib/libc/sparcv9/gen/strncpy.s usr/src/lib/libc/sparcv9/gen/sync_instruction_memory.s usr/src/lib/libc/sparcv9/sys/sparc_utrap_install.s usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s usr/src/lib/libc_psr/sun4u-us3/common/memset.s usr/src/lib/libc_psr/sun4u/common/memcmp.s usr/src/lib/libc_psr/sun4u/common/memcpy.s usr/src/lib/libc_psr/sun4u/common/memset.s usr/src/lib/libc_psr/sun4v/common/memcpy.s usr/src/lib/libc_psr/sun4v/common/memset.s usr/src/lib/libslp/javalib/com/sun/slp/ActiveDiscoverer.java usr/src/lib/libslp/javalib/com/sun/slp/Advertiser.java usr/src/lib/libslp/javalib/com/sun/slp/Assert.java usr/src/lib/libslp/javalib/com/sun/slp/AttributeDescriptor.java usr/src/lib/libslp/javalib/com/sun/slp/AttributePattern.java usr/src/lib/libslp/javalib/com/sun/slp/AttributeString.java usr/src/lib/libslp/javalib/com/sun/slp/AttributeVerifier.java usr/src/lib/libslp/javalib/com/sun/slp/CAttrMsg.java usr/src/lib/libslp/javalib/com/sun/slp/CDAAdvert.java usr/src/lib/libslp/javalib/com/sun/slp/CSAAdvert.java usr/src/lib/libslp/javalib/com/sun/slp/CSrvDereg.java usr/src/lib/libslp/javalib/com/sun/slp/CSrvMsg.java usr/src/lib/libslp/javalib/com/sun/slp/CSrvReg.java usr/src/lib/libslp/javalib/com/sun/slp/CSrvTypeMsg.java usr/src/lib/libslp/javalib/com/sun/slp/ClientMsgManager.java usr/src/lib/libslp/javalib/com/sun/slp/DAAdvertiser.java usr/src/lib/libslp/javalib/com/sun/slp/DATable.java usr/src/lib/libslp/javalib/com/sun/slp/Defaults.java usr/src/lib/libslp/javalib/com/sun/slp/IANACharCode.java usr/src/lib/libslp/javalib/com/sun/slp/Listener.java usr/src/lib/libslp/javalib/com/sun/slp/Locator.java usr/src/lib/libslp/javalib/com/sun/slp/Opaque.java usr/src/lib/libslp/javalib/com/sun/slp/Parser.java usr/src/lib/libslp/javalib/com/sun/slp/PermSARegTable.java usr/src/lib/libslp/javalib/com/sun/slp/RequestHandler.java usr/src/lib/libslp/javalib/com/sun/slp/SARequester.java usr/src/lib/libslp/javalib/com/sun/slp/SAttrMsg.java usr/src/lib/libslp/javalib/com/sun/slp/SDAAdvert.java usr/src/lib/libslp/javalib/com/sun/slp/SLPConfig.java usr/src/lib/libslp/javalib/com/sun/slp/SLPDgui.java usr/src/lib/libslp/javalib/com/sun/slp/SLPHeaderV1.java usr/src/lib/libslp/javalib/com/sun/slp/SLPHeaderV2.java usr/src/lib/libslp/javalib/com/sun/slp/SLPServerHeaderV2.java usr/src/lib/libslp/javalib/com/sun/slp/SLPTemplateRegistry.java usr/src/lib/libslp/javalib/com/sun/slp/SLPV1CDAAdvert.java usr/src/lib/libslp/javalib/com/sun/slp/SLPV1Manager.java usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SAttrMsg.java usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SDAAdvert.java usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvDereg.java usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvMsg.java usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvReg.java usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvTypeMsg.java usr/src/lib/libslp/javalib/com/sun/slp/SSAAdvert.java usr/src/lib/libslp/javalib/com/sun/slp/SSrvDereg.java usr/src/lib/libslp/javalib/com/sun/slp/SSrvMsg.java usr/src/lib/libslp/javalib/com/sun/slp/SSrvReg.java usr/src/lib/libslp/javalib/com/sun/slp/SSrvTypeMsg.java usr/src/lib/libslp/javalib/com/sun/slp/ServerAttribute.java usr/src/lib/libslp/javalib/com/sun/slp/ServerDATable.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttribute.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeDescriptor.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeV1.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeVerifier.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationEnumeration.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationEnumerator.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationException.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationManager.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceStore.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceStoreFactory.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceStoreInMemory.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceTable.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceType.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceURL.java usr/src/lib/libslp/javalib/com/sun/slp/ServiceURLV1.java usr/src/lib/libslp/javalib/com/sun/slp/SrvLocHeader.java usr/src/lib/libslp/javalib/com/sun/slp/SrvLocMsg.java usr/src/lib/libslp/javalib/com/sun/slp/SrvLocMsgImpl.java usr/src/lib/libslp/javalib/com/sun/slp/StreamListener.java usr/src/lib/libslp/javalib/com/sun/slp/SunDATable.java usr/src/lib/libslp/javalib/com/sun/slp/SunServerDATable.java usr/src/lib/libslp/javalib/com/sun/slp/TemplateRegistry.java usr/src/lib/libslp/javalib/com/sun/slp/UARequester.java usr/src/lib/libslp/javalib/com/sun/slp/URLAttributeVerifier.java usr/src/lib/libslp/javalib/com/sun/slp/slpd.java usr/src/lib/libtnfctl/i386_assm.s usr/src/lib/libtnfctl/sparc_assm.s usr/src/pkgdefs/SUNWmibii/pkginfo.tmpl usr/src/pkgdefs/SUNWsacom/pkginfo.tmpl usr/src/pkgdefs/SUNWsasnm/pkginfo.tmpl usr/src/prototypes/prototype.Makefile usr/src/prototypes/prototype.c usr/src/prototypes/prototype.csh usr/src/prototypes/prototype.h usr/src/prototypes/prototype.java usr/src/prototypes/prototype.ksh usr/src/prototypes/prototype.man usr/src/prototypes/prototype.pl usr/src/prototypes/prototype.py usr/src/prototypes/prototype.s usr/src/prototypes/prototype.sh usr/src/tools/abi/audit/abi_audit.c usr/src/tools/codereview/codereview.1 usr/src/tools/codereview/lwlp.c usr/src/tools/cw/cw.c usr/src/tools/env/developer.sh usr/src/tools/env/gatekeeper.sh usr/src/tools/env/opensolaris.sh usr/src/tools/onbld/Checks/Rti.py usr/src/tools/onbld/Scm/Backup.py usr/src/tools/onbld/Scm/WorkSpace.py usr/src/tools/onbld/hgext/cdm.py usr/src/tools/scripts/acr.1 usr/src/tools/scripts/hg-active.py usr/src/tools/scripts/hgsetup.sh usr/src/tools/scripts/webrev.sh usr/src/tools/scripts/wx.sh usr/src/ucbcmd/sbcp/sbcp.s usr/src/ucblib/libucb/sparc/sys/setjmp.s usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/asym_sun.c usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/sym.c usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tape.c usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h
diffstat 510 files changed, 1409 insertions(+), 2665 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed Aug 06 16:29:39 2008 -0600
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+syntax: glob
+*
--- a/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # MM_Solaris_ON.pm overrides various parts of MakeMaker so that perl modules
@@ -45,7 +43,7 @@
 use strict;
 use warnings;
 our ($VERSION, @ISA);
-$VERSION = '%I%';
+$VERSION = '1.3';
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 @ISA = qw(ExtUtils::MM_Any ExtUtils::MM_Unix);
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,9 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Catalog.pm contains perl code for exacct catalog tag manipulation.
 # 
@@ -33,7 +34,7 @@
 
 package Sun::Solaris::Exacct::Catalog;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use Carp;
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Exacct.pm contains wrappers for the exacct error functions and syscalls,
 # and some 'shorthand' convenience functions.
@@ -34,7 +34,7 @@
 
 package Sun::Solaris::Exacct;
 
-our $VERSION = '%I%';
+our $VERSION = '1.5';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,9 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # File.pm contains wrappers for the exacct file manipulation routines.
 # 
@@ -33,7 +34,7 @@
 
 package Sun::Solaris::Exacct::File;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +21,7 @@
 # Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Object.pm contains perl code for exacct object manipulation.
 #
@@ -33,7 +32,7 @@
 
 package Sun::Solaris::Exacct::Object;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Exacct.pm.  This in turn contains the SID of the Exacct.pm file, so if anything
-under this directory is modified, a delta should be made to Exacct.pm to
-update the module version number correctly.  If this is not done, it will not
-be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Exacct.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Exacct.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Kstat.pm provides the bootstrap for the Sun::Solaris::Kstat module.
@@ -34,7 +32,7 @@
 use strict;
 use DynaLoader;
 use vars qw($VERSION @ISA);
-$VERSION = '%I%';
+$VERSION = '1.3';
 @ISA = qw(DynaLoader);
 bootstrap Sun::Solaris::Kstat $VERSION;
 1;
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-Version %I%
+Version 1.1
 Initial Public Source release.
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -23,16 +23,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Lgrp.pm provides procedural and object-oriented interface to the Solaris
 # liblgrp(3LIB) library.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 require 5.6.1;
 use strict;
@@ -41,7 +37,7 @@
 
 package Sun::Solaris::Lgrp;
 
-our $VERSION = '%I%';
+our $VERSION = '1.1';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON	Wed Aug 06 16:29:39 2008 -0600
@@ -20,22 +20,19 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Lgrp.pm.  This in turn contains the SID of the Lgrp.pm file, so if
-anything under this directory is modified, a delta should be made to Lgrp.pm
-to update the module version number correctly.  If this is not done, it will
-not be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Lgrp.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Lgrp.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,13 +21,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 use strict;
 use warnings;
 use Config;
-our $VERSION = '%I%';
+our $VERSION = '1.2';
 
 my $fh;
 open($fh, ">$ARGV[0]") || die("Can't open perlgcc: $!\n");
@@ -44,13 +41,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%$ARGV[0]	%I%	%E% SMI"
-#
 
 use $perlver;
 use strict;
 use warnings;
-our \$VERSION = '%I%';
+our \$VERSION = '$VERSION';
 
 \$ENV{PERL5_OVERRIDE_CONFIG} = '1';
 if (exists(\$ENV{PERL5LIB})) {
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Privilege.pm provides the bootstrap for the Sun::Solaris::Privilege module.
 #
@@ -33,7 +33,7 @@
 
 package Sun::Solaris::Privilege;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Project.pm provides the bootstrap for the Sun::Solaris::Project module, and
 # also functions for reading, validating and writing out project(4) format
@@ -41,7 +41,7 @@
 
 package Sun::Solaris::Project;
 
-our $VERSION = '%I%';
+our $VERSION = '1.9';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Project.pm.  This in turn contains the SID of the Project.pm file, so if
-anything under this directory is modified, a delta should be made to Project.pm
-to update the module version number correctly.  If this is not done, it will
-not be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Project.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Project.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Task.pm.  This in turn contains the SID of the Task.pm file, so if anything
-under this directory is modified, a delta should be made to Task.pm to
-update the module version number correctly.  If this is not done, it will not
-be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Task.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Task.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,6 +1,3 @@
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
@@ -21,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Task.pm provides the bootstrap for the Sun::Solaris::Task module.
 #
@@ -32,7 +34,7 @@
 
 package Sun::Solaris::Task;
 
-our $VERSION = '%I%';
+our $VERSION = '1.4';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -1,13 +1,9 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Ucred.pm provides the bootstrap for the Sun::Solaris::Ucred module.
 #
@@ -33,7 +34,7 @@
 
 package Sun::Solaris::Ucred;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Utils.pm provides the bootstrap for the Sun::Solaris::Utils module.
@@ -35,7 +33,7 @@
 use Exporter;
 use DynaLoader;
 use vars qw($VERSION @ISA @EXPORT_OK);
-$VERSION = '%I%';
+$VERSION = '1.3';
 @ISA = qw(Exporter DynaLoader);
 @EXPORT_OK = qw(gmatch gettext textdomain bindtextdomain dcgettext dgettext);
 bootstrap Sun::Solaris::Utils $VERSION;
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveProjectModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveProjectModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * Data model of a Solaris project.
  * It encapsulates a CIM instance of the Solaris_ActiveProject class.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 
 public class ActiveProjectModel extends SRMProviderDataModel
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveUserModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ActiveUserModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * Data model of an active user that is actively running on an OperatingSystem.
  * It encapsulates a CIM instance of the Solaris_ActiveUser class.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class ActiveUserModel extends SRMProviderDataModel
 	implements SRMProviderProperties, Solaris_ActiveUserProperties {
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/DataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/DataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * Aggregation of all users, projects, and sets metrics data.
  * Implements the singleton pattern
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 class DataModel {
 
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessAggregateDataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessAggregateDataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * a Solaris_ProjectProcessAggregateStatisticalInformation
  * or Solaris_UserProcessAggregateStatisticalInformation class.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class ProcessAggregateDataModel extends ProcessDataModel {
 
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessDataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ProcessDataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -39,7 +36,6 @@
  * Data model of Process Utilization. It encapsulates a CIM instance of
  * a Solaris_ProcessStatisticalInformation class.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class ProcessDataModel extends SRMProviderDataModel
 	implements SRMProviderProperties,
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ResourceMonitor.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/ResourceMonitor.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -37,7 +34,6 @@
  * Mediator between data model the native interface and the client.
  * Implements the singleton pattern.
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 public final class ResourceMonitor {
     /**
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProvider.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProvider.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -51,7 +48,6 @@
  * contains several utility methods which may be useful to the individual
  * provider classes.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public abstract class SRMProvider
 	implements InstanceProvider, MethodProvider, SRMProviderProperties {
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderDataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderDataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -40,7 +37,6 @@
 /**
  * This is the base class for the SRM provider data models.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 abstract class SRMProviderDataModel implements SRMProviderProperties {
 
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderProperties.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SRMProviderProperties.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -35,7 +32,6 @@
  * This class defines common properties used in Acacia
  * providers.
  * @author SMI
- * @version %R%
  */
 public interface SRMProviderProperties {
 
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SetProp.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SetProp.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -37,7 +34,6 @@
  * This is the base class for set property classes. Each
  * derived class can format a string into one CIM data format.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 abstract class SetProp implements PropertyAccessInterface {
 
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProject.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProject.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -46,7 +43,6 @@
  * Provider of the Solaris_ActiveProject class. This class represents
  * a Project that is actively running on an OperatingSystem.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_ActiveProject extends SRMProvider
 	implements Authorizable, Solaris_ActiveProjectProperties {
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProjectProcessAggregateStatistics.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveProjectProcessAggregateStatistics.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -44,7 +41,6 @@
  * This class represents a link between a Project active on a system and the
  * aggregated resource usage of its Process(es).
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class  Solaris_ActiveProjectProcessAggregateStatistics
 	extends SRMProvider {
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUser.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUser.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -46,7 +43,6 @@
  * Provider of the Solaris_ActiveUser class. This class represents
  * a ActiveUser that is actively running on an OperatingSystem.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_ActiveUser extends SRMProvider
 	implements Authorizable, Solaris_ActiveUserProperties {
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUserProcessAggregateStatistics.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ActiveUserProcessAggregateStatistics.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -44,7 +41,6 @@
  * This class represents a link between an User active on a system and the
  * aggregated resource usage of its Process(es).
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class  Solaris_ActiveUserProcessAggregateStatistics extends SRMProvider {
 
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformation.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformation.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -45,7 +42,6 @@
  * Provider of the Solaris_ProcessStatisticalInformation class.
  * This class provides raw resource utilization measurements for a process.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_ProcessStatisticalInformation extends SRMProvider
 	implements Solaris_ProcessStatisticalInformationProperties {
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformationProperties.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatisticalInformationProperties.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -35,7 +32,6 @@
  * Defines property names of the Solaris_ProcessStatisticalInformation and
  * the corresponding keys in the RDS protocol
  * @author SMI
- * @version %R%
  */
 public interface Solaris_ProcessStatisticalInformationProperties {
     /**
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatistics.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProcessStatistics.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -43,7 +40,6 @@
  * Solaris_ProcessStatisticalInformation instance a raw resource utilization
  * measurements for a process.
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 public class Solaris_ProcessStatistics extends SRMProvider {
 
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProjectProcessAggregateStatisticalInformation.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_ProjectProcessAggregateStatisticalInformation.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -49,7 +46,6 @@
  * ProcessStatisticalInformation properties are populated by summing the
  * underlying process's usage.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_ProjectProcessAggregateStatisticalInformation
 	extends SRMProvider
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_UserProcessAggregateStatisticalInformation.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Solaris_UserProcessAggregateStatisticalInformation.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -49,7 +46,6 @@
  * ProcessStatisticalInformation properties are populated by summing the
  * underlying process' usage.
  * @author Sun Microsystems
- * @version %I% %G%
  */
 public class Solaris_UserProcessAggregateStatisticalInformation
 	extends SRMProvider
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SystemDataModel.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/SystemDataModel.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -40,7 +37,6 @@
  * class. The data fields are defined as static in the superclass, since they
  * should be accessible by all provider data models.
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 public class SystemDataModel extends SRMProviderDataModel
 	implements SRMProviderProperties {
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Util.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Util.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -40,7 +37,6 @@
 /**
  * Utility class 
  * @author Sun Microsystems
- * @version %I% %G%
  */
 class Util {
     
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/rmon.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/rmon.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,6 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
@@ -38,7 +35,6 @@
  * Simple CLI to test ResourceMonitor class. Prints the current user, projects
  * and processor sets metrics on the stdout.
  * @author Sun Microsystems, Inc.
- * @version %I% %G%
  */
 public class rmon {
 
--- a/usr/src/common/atomic/amd64/atomic.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/common/atomic/amd64/atomic.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"atomic.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/common/atomic/i386/atomic.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/common/atomic/i386/atomic.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"atomic.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/common/atomic/sparc/atomic.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/common/atomic/sparc/atomic.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"atomic.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/common/atomic/sparcv9/atomic.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/common/atomic/sparcv9/atomic.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"atomic.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/c_synonyms/amd64/synonyms.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/c_synonyms/amd64/synonyms.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"synonyms.s"
 
 #define	SYN(name)				\
 	.align	16;				\
--- a/usr/src/lib/c_synonyms/i386/synonyms.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/c_synonyms/i386/synonyms.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"synonyms.s"
 
 #define	SYN(name)					\
 	.align	16;					\
--- a/usr/src/lib/c_synonyms/sparc/synonyms.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/c_synonyms/sparc/synonyms.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"synonyms.s"
 
 #define	SYN(name)				\
 	.align	4;				\
--- a/usr/src/lib/c_synonyms/sparcv9/synonyms.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/c_synonyms/sparcv9/synonyms.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"synonyms.s"
 
 #define	SYN(name)				\
 	.align	4;				\
--- a/usr/src/lib/common/amd64/crti.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/common/amd64/crti.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"crti.s"
 
 /*
  * These crt*.o modules are provided as the bare minimum required
--- a/usr/src/lib/common/amd64/crtn.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/common/amd64/crtn.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"crtn.s"
 
 /*
  * These crt*.o modules are provided as the bare minimum required
--- a/usr/src/lib/common/i386/crt1.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/common/i386/crt1.s	Wed Aug 06 16:29:39 2008 -0600
@@ -30,9 +30,7 @@
  * where it will be picked up by gcc, along with crti.o and crtn.o
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"crt1.s"
 
 	.globl	_start
 
--- a/usr/src/lib/common/sparcv9/crti.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/common/sparcv9/crti.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -35,9 +34,7 @@
  * For further details - see bug#4433015
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file		"%M%"
+	.file		"crti.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/common/sparcv9/crtn.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/common/sparcv9/crtn.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -34,9 +33,7 @@
  * For further details - see bug#4433015
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file		"%M%"
+	.file		"crtn.s"
 
 /*
  * _init function epilogue
--- a/usr/src/lib/libc/amd64/crt/cerror.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/crt/cerror.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"cerror.s"
 
 / C return sequence which sets errno, returns -1.
 
--- a/usr/src/lib/libc/amd64/fp/__xgetRD.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/fp/__xgetRD.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__xgetRD.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/amd64/fp/_xtoll.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/fp/_xtoll.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_xtoll.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/amd64/fp/_xtoull.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/fp/_xtoull.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_xtoull.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/amd64/fp/fpcw.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/fp/fpcw.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpcw.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/amd64/gen/_getsp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/_getsp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_getsp.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/gen/_stack_grow.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/_stack_grow.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_stack_grow.s"
 
 /* 
  * void *
--- a/usr/src/lib/libc/amd64/gen/abs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/abs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"abs.s"
 
 /*
  *	Assembler program to implement the following C program
--- a/usr/src/lib/libc/amd64/gen/alloca.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/alloca.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"alloca.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/gen/amd64_data.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/amd64_data.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"amd64_data.s"
 
 / This file contains
 / the definition of the
--- a/usr/src/lib/libc/amd64/gen/byteorder.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/byteorder.s	Wed Aug 06 16:29:39 2008 -0600
@@ -23,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"byteorder.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/gen/cache.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/cache.s	Wed Aug 06 16:29:39 2008 -0600
@@ -45,9 +45,7 @@
  * regulations applicable in licensee's jurisdiction.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"cache.s"
 
 #include "SYS.h"
 #include "cache.h"
--- a/usr/src/lib/libc/amd64/gen/cuexit.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/cuexit.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"cuexit.s"
 
 / C library -- exit
 / exit(code)
--- a/usr/src/lib/libc/amd64/gen/lock.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/lock.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lock.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/gen/memccpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/memccpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memccpy.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/amd64/gen/memchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/memchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memchr.s"
 
 /
 / memchr(sptr, c1, n)
--- a/usr/src/lib/libc/amd64/gen/memcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/memcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -45,9 +45,7 @@
  * regulations applicable in licensee's jurisdiction.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcmp.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/amd64/gen/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -34,9 +34,7 @@
  *	Implements memcpy() and memmove() libc primitives.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/amd64/gen/memset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/memset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -29,9 +29,7 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memset.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/amd64/gen/proc64_support.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/proc64_support.s	Wed Aug 06 16:29:39 2008 -0600
@@ -34,9 +34,7 @@
  * cache size information. Cache information used by memset, strcpy, etc..
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"proc64_support.s"
 
 #include <sys/asm_linkage.h>
 #include "proc64_id.h"
--- a/usr/src/lib/libc/amd64/gen/setjmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/setjmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setjmp.s"
 
 /*
  *	longjmp(env, val)
--- a/usr/src/lib/libc/amd64/gen/strcat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strcat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcat.s"
 
 /
 / strcat(s1, s2)
--- a/usr/src/lib/libc/amd64/gen/strchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strchr.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/gen/strcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -45,9 +45,7 @@
  * regulations applicable in licensee's jurisdiction.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcmp.s"
 
 #include "SYS.h"
 #include "cache.h"
--- a/usr/src/lib/libc/amd64/gen/strcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -45,9 +45,7 @@
  * regulations applicable in licensee's jurisdiction.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcpy.s"
 
 #include "SYS.h"
 #include "cache.h"
--- a/usr/src/lib/libc/amd64/gen/strlen.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strlen.s	Wed Aug 06 16:29:39 2008 -0600
@@ -45,9 +45,7 @@
  * regulations applicable in licensee's jurisdiction.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strlen.s"
 
 #include "SYS.h"
 #include "cache.h"
--- a/usr/src/lib/libc/amd64/gen/strncat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strncat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncat.s"
 
 /
 / strncat(s1, s2, n)
--- a/usr/src/lib/libc/amd64/gen/strncmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strncmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncmp.s"
 
 #define	USE_AS_STRNCMP
 #include "strcmp.s"
--- a/usr/src/lib/libc/amd64/gen/strncpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strncpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncpy.s"
 
 #define	USE_AS_STRNCPY
 #include "strcpy.s"
--- a/usr/src/lib/libc/amd64/gen/strrchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/strrchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strrchr.s"
 
 /
 / strrchr(sp, c)
--- a/usr/src/lib/libc/amd64/gen/wschr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/wschr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"wschr.s"
 
 /
 / Wide character wcschr() implementation
--- a/usr/src/lib/libc/amd64/gen/wslen.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/wslen.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"wslen.s"
 
 /*
  * Wide character wcslen() implementation
--- a/usr/src/lib/libc/amd64/gen/wsncmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/gen/wsncmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"wsncmp.s"
 
 /
 / Wide character wcsncpy() implementation
--- a/usr/src/lib/libc/amd64/sys/__clock_gettime.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/__clock_gettime.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__clock_gettime.s"
 
 #include <sys/time_impl.h>
 #include "SYS.h"
--- a/usr/src/lib/libc/amd64/sys/__getcontext.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/__getcontext.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__getcontext.s"
 
 /*
  * __getcontext() must be implemented in assembler, as opposed
--- a/usr/src/lib/libc/amd64/sys/__uadmin.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/__uadmin.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__uadmin.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/sys/_lwp_mutex_unlock.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/_lwp_mutex_unlock.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_lwp_mutex_unlock.s"
 
 #include "SYS.h"
 #include <../assym.h>
--- a/usr/src/lib/libc/amd64/sys/door.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/door.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"door.s"
 
 #include "SYS.h"
 #include <sys/door.h>
--- a/usr/src/lib/libc/amd64/sys/forkallx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/forkallx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"forkallx.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/sys/forkx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/forkx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"forkx.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/sys/getcontext.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/getcontext.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getcontext.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/amd64/sys/gettimeofday.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/gettimeofday.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"gettimeofday.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/sys/lwp_private.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/lwp_private.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lwp_private.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/sys/pipe.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/pipe.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"pipe.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/amd64/sys/syscall.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/syscall.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"syscall.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/sys/sysi86.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/sysi86.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sysi86.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/amd64/sys/uname.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/uname.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"uname.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/amd64/sys/vforkx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/sys/vforkx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"vforkx.s"
 
 #include "SYS.h"
 #include <assym.h>
--- a/usr/src/lib/libc/amd64/threads/asm_subr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/threads/asm_subr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"asm_subr.s"
 
 #include <SYS.h>
 #include <sys/regset.h>
--- a/usr/src/lib/libc/amd64/threads/tls_get_addr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/threads/tls_get_addr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"tls_get_addr.s"
 
 /*
  * To make thread-local storage accesses as fast as possible, we
--- a/usr/src/lib/libc/amd64/unwind/unwind_frame.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/amd64/unwind/unwind_frame.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"unwind_frame.s"
 
 #ifdef _LIBCRUN_
 #define ENTRY(x) \
--- a/usr/src/lib/libc/common/sys/__clock_timer.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/__clock_timer.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__clock_timer.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/__getloadavg.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/__getloadavg.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__getloadavg.s"
 
 /*
  * int __getloadavg(int *buf, int nelem);
--- a/usr/src/lib/libc/common/sys/__rusagesys.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/__rusagesys.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__rusagesys.s"
 
 /*
  * int __rusagesys(type, struct rusage *)
--- a/usr/src/lib/libc/common/sys/__signotify.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/__signotify.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__signotify.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/__sigrt.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/__sigrt.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__sigrt.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/__time.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/__time.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__time.s"
 
 /*
  * raw system calls:
--- a/usr/src/lib/libc/common/sys/_lgrp_home_fast.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_lgrp_home_fast.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_lgrp_home_fast.s"
 
 /*
  * C library -- gethomelgroup
--- a/usr/src/lib/libc/common/sys/_lgrpsys.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_lgrpsys.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_lgrpsys.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/_nfssys.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_nfssys.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_nfssys.s"
 
 /* C library -- nfssys						*/
 /* int nfssys(int opcode, int arg)				*/
--- a/usr/src/lib/libc/common/sys/_portfs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_portfs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -23,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_portfs.s"
 
 /*
  * C library implementation -- _portfs()
--- a/usr/src/lib/libc/common/sys/_pset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_pset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_pset.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/_rpcsys.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_rpcsys.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_rpcsys.s"
 
 /* rpcsys						*/
 /* int rpcsys(int opcode, int arg)				*/
--- a/usr/src/lib/libc/common/sys/_sigaction.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_sigaction.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_sigaction.s"
 
 /* C library -- sigaction					*/
 /* int sigaction (int sig, struct sigaction *act);		*/
--- a/usr/src/lib/libc/common/sys/_so_accept.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_accept.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_accept.s"
 
 /* C library -- __so_accept						*/
 /* int __so_accept(int sock, struct sockaddr *addr, int *addrlen, int vers) */
--- a/usr/src/lib/libc/common/sys/_so_bind.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_bind.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_bind.s"
 
 /* C library -- _so_bind						*/
 /* int _so_bind (int fildes, struct sockaddr *name, int namelen, int vers); */
--- a/usr/src/lib/libc/common/sys/_so_connect.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_connect.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_connect.s"
 
 /* C library -- __so_connect						*/
 /* int __so_connect(int sock, struct sockaddr *addr, int addrlen, int vers) */
--- a/usr/src/lib/libc/common/sys/_so_getpeername.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_getpeername.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_getpeername.s"
 
 /* C library -- _so_getpeername					*/
 /* int _so_getpeername (int fildes, struct sockaddr *name,	*/
--- a/usr/src/lib/libc/common/sys/_so_getsockname.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_getsockname.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_getsockname.s"
 
 /* C library -- _so_getsockname						*/
 /* int _so_getsockname (int fildes, struct sockaddr *name, int namelen,	*/
--- a/usr/src/lib/libc/common/sys/_so_getsockopt.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_getsockopt.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_getsockopt.s"
 
 /* C library -- _so_getsockopt					*/
 /* int _so_getsockopt (int socket, int level, int option_name,	*/
--- a/usr/src/lib/libc/common/sys/_so_listen.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_listen.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_listen.s"
 
 /* C library -- _so_listen					*/
 /* int _so_listen (int socket, int backlog, int vers);	 	*/
--- a/usr/src/lib/libc/common/sys/_so_recv.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_recv.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_recv.s"
 
 /* C library -- _so_recv						*/
 /* int __so_recv(int sock, void *buffer, size_t len, int flags)		*/
--- a/usr/src/lib/libc/common/sys/_so_recvfrom.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_recvfrom.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_recvfrom.s"
 
 /* C library -- __so_recvfrom					*/
 /*
--- a/usr/src/lib/libc/common/sys/_so_recvmsg.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_recvmsg.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_recvmsg.s"
 
 /* C library -- __so_recvmsg					*/
 /* int __so_recvmsg(int sock, struct msghdr *msg, int flags)	*/
--- a/usr/src/lib/libc/common/sys/_so_send.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_send.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_send.s"
 
 /* C library -- __so_send						*/
 /* int __so_send(int socket, const void *buffer, size_t len, int flags)	*/
--- a/usr/src/lib/libc/common/sys/_so_sendmsg.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_sendmsg.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_sendmsg.s"
 
 /* C library -- __so_sendmsg						*/
 /* int __so_sendmsg(int sock, const struct msghdr *msg, int flags)	*/
--- a/usr/src/lib/libc/common/sys/_so_sendto.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_sendto.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_sendto.s"
 
 /* C library -- __so_sendto					*/
 /*
--- a/usr/src/lib/libc/common/sys/_so_setsockopt.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_setsockopt.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_setsockopt.s"
 
 /* C library -- _so_setsockopt					*/
 /* int _so_setsockopt (int socket, int level, int option_name,	*/
--- a/usr/src/lib/libc/common/sys/_so_shutdown.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_shutdown.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_shutdown.s"
 
 /* C library -- _so_shutdown					*/
 /* int _so_shutdown (int fildes, int how, int vers);		*/
--- a/usr/src/lib/libc/common/sys/_so_socket.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_socket.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_socket.s"
 
 /* C library -- _so_socket					*/
 /*
--- a/usr/src/lib/libc/common/sys/_so_socketpair.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_so_socketpair.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_so_socketpair.s"
 
 /* C library -- _so_socketpair					*/
 /*
--- a/usr/src/lib/libc/common/sys/_sockconfig.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/_sockconfig.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_sockconfig.s"
 
 /* C library -- _sockconfig					*/
 /*
--- a/usr/src/lib/libc/common/sys/access.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/access.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"access.s"
 
 /* C library -- access						*/
 /* int access(char *path, int amode)				*/
--- a/usr/src/lib/libc/common/sys/acct.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/acct.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"acct.s"
 
 /* C library -- acct						*/
 /* int acct(const char *path)					*/
--- a/usr/src/lib/libc/common/sys/acl.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/acl.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"acl.s"
 
 /* C library -- acl						*/
 /* int acl(const char *path, int cmd, int cnt, struct aclent *buf)	*/
--- a/usr/src/lib/libc/common/sys/adjtime.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/adjtime.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"adjtime.s"
 
 /* C Library -- adjtime						*/
 /* int adjtime(struct timeval *delta, struct timeval *olddelta)	*/
--- a/usr/src/lib/libc/common/sys/alarm.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/alarm.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"alarm.s"
 
 /* C library -- alarm						*/
 /* unsigned alarm(unsigned seconds)				*/
--- a/usr/src/lib/libc/common/sys/brk.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/brk.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"brk.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/chdir.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/chdir.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"chdir.s"
 
 /* C library -- chdir						*/
 /* int chdir(char *path)					*/
--- a/usr/src/lib/libc/common/sys/chmod.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/chmod.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"chmod.s"
 
 /* C library -- chmod						*/
 /* int chmod(char *path, mode_t mode)				*/
--- a/usr/src/lib/libc/common/sys/chown.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/chown.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"chown.s"
 
 /* C library -- chown						*/
 /* int chown(char *path, uid_t owner, gid_t group)		*/
--- a/usr/src/lib/libc/common/sys/chroot.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/chroot.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"chroot.s"
 
 /* C library -- chroot						*/
 /* int chroot(const char *path)					*/
--- a/usr/src/lib/libc/common/sys/cladm.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/cladm.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"cladm.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/close.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/close.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"close.s"
 
 /* C library -- close					*/
 /* int __close(int fildes)				*/
--- a/usr/src/lib/libc/common/sys/creat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/creat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"creat.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/dup.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/dup.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"dup.s"
 
 /* C library -- dup						*/
 /* int dup(int fildes)						*/
--- a/usr/src/lib/libc/common/sys/execve.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/execve.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"execve.s"
 
 /* C library -- execve						*/
 /* int execve(const char *path, const char *argv[], const char *envp[])
--- a/usr/src/lib/libc/common/sys/exit.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/exit.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"exit.s"
 
 /* C library -- _exit
  *
--- a/usr/src/lib/libc/common/sys/facl.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/facl.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"facl.s"
 
 /* C library -- facl						*/
 /* int facl(int fd, int cmd, int cnt, struct aclent *buf)	*/
--- a/usr/src/lib/libc/common/sys/fchdir.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fchdir.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fchdir.s"
 
 /* C library -- fchdir						*/
 /* int fchdir(int fildes)					*/
--- a/usr/src/lib/libc/common/sys/fchmod.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fchmod.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fchmod.s"
 
 /* C library -- fchmod						*/
 /* int fchmod(int fildes, mode_t mode)				*/
--- a/usr/src/lib/libc/common/sys/fchown.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fchown.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fchown.s"
 
 /* C library -- fchown						*/
 /* int fchown(int fildes, uid_t owner, gid_t group)		*/
--- a/usr/src/lib/libc/common/sys/fchroot.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fchroot.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fchroot.s"
 
 /* C library -- fchroot						*/
 /* int fchroot(const int fd)					*/
--- a/usr/src/lib/libc/common/sys/fcntl.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fcntl.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fcntl.s"
 
 /*
  * int __fcntl_syscall(int fildes, int cmd [, arg])
--- a/usr/src/lib/libc/common/sys/fdsync.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fdsync.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fdsync.s"
 
 /* Underlying function for C library(fsync) and POSIX(fdatasync)*/
 /* int __fdsync(int fildes, int flag)				*/
--- a/usr/src/lib/libc/common/sys/fpathconf.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fpathconf.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpathconf.s"
 
 /* C library -- fpathconf					*/
 /* int fpathconf(int fd, int name)				*/
--- a/usr/src/lib/libc/common/sys/fstat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fstat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fstat.s"
 
 /* C library -- fstat						*/
 /* int fstat (int fildes, struct stat *buf)			*/
--- a/usr/src/lib/libc/common/sys/fstatfs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fstatfs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fstatfs.s"
 
 /* C library -- fstatfs						*/
 /* int fstatfs(int fildes, struct statfs *buf, int len,
--- a/usr/src/lib/libc/common/sys/fstatvfs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/fstatvfs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fstatvfs.s"
 
 /* C library -- fstatvfs					*/
 /* int fstatvfs(int fildes, struct statvfs *buf)		*/
--- a/usr/src/lib/libc/common/sys/getcpuid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getcpuid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getcpuid.s"
 
 /*
  * C library -- getcpuid
--- a/usr/src/lib/libc/common/sys/getdents.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getdents.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getdents.s"
 
 /* C library -- getdents					*/
 /* int getdents (int fildes, struct dirent *buf, size_t count)	*/
--- a/usr/src/lib/libc/common/sys/getegid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getegid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getegid.s"
 
 /*
  * C library -- getegid
--- a/usr/src/lib/libc/common/sys/geteuid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/geteuid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"geteuid.s"
 
 /*
  * C library -- geteuid
--- a/usr/src/lib/libc/common/sys/getgid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getgid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getgid.s"
 
 /* C library -- getgid						*/
 /* gid_t getgid (void);						*/
--- a/usr/src/lib/libc/common/sys/getgroups.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getgroups.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getgroups.s"
 
 /* C library -- getgroups					*/
 /* int getgroups(int gidsetsize, uid_t grouplist[]);		*/
--- a/usr/src/lib/libc/common/sys/gethrtime.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/gethrtime.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"gethrtime.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/getitimer.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getitimer.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getitimer.s"
 
 /* C library -- getgid						*/
 /* int getitimer (int, struct itimerval *value);		*/
--- a/usr/src/lib/libc/common/sys/getmsg.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getmsg.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getmsg.s"
 
 /* C library -- getmsg						*/
 /* int __getmsg(int fd, struct strbuf *ctlptr,			*/
--- a/usr/src/lib/libc/common/sys/getpid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getpid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getpid.s"
 
 /* C library -- getpid						*/
 /* pid_t getpid (void)						*/
--- a/usr/src/lib/libc/common/sys/getpmsg.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getpmsg.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getpmsg.s"
 
 /* C library -- getpmsg						*/
 /* int __getpmsg(int fd, struct strbuf *ctlptr,			*/
--- a/usr/src/lib/libc/common/sys/getppid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getppid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getppid.s"
 
 /*
  * C library -- getppid
--- a/usr/src/lib/libc/common/sys/getrlimit.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getrlimit.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getrlimit.s"
 
 /* C library -- getrlimit					*/
 /* int getrlimit(int resources, struct rlimit *rlp)		*/
--- a/usr/src/lib/libc/common/sys/getuid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/getuid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getuid.s"
 
 /* C library -- getuid						*/
 /* uid_t getuid (void);						*/
--- a/usr/src/lib/libc/common/sys/gtty.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/gtty.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"gtty.s"
 
 /* C library -- gtty						*/
 /* int gtty (int fildes, int arg);				*/
--- a/usr/src/lib/libc/common/sys/install_utrap.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/install_utrap.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"install_utrap.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/common/sys/ioctl.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/ioctl.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"ioctl.s"
 
 /* C library -- ioctl						*/
 /* int ioctl (int fildes, int request, ... );			*/
--- a/usr/src/lib/libc/common/sys/kaio.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/kaio.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"kaio.s"
 
 /* C library -- kaio						*/
 /* intptr_t _kaio (); */
--- a/usr/src/lib/libc/common/sys/kill.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/kill.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"kill.s"
 
 /* C library -- kill						*/
 /* int kill (pid_t pid, int sig);				*/
--- a/usr/src/lib/libc/common/sys/lchown.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/lchown.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lchown.s"
 
 /* C library -- lchown						*/
 /* int lchown(const char *path, uid_t owner, gid_t group)	*/
--- a/usr/src/lib/libc/common/sys/link.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/link.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"link.s"
 
 /* C library -- link						*/
 /* int link (const char *path1, const char *path2);		*/
--- a/usr/src/lib/libc/common/sys/llseek.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/llseek.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"llseek.s"
 
 /*
  * C library -- llseek
--- a/usr/src/lib/libc/common/sys/lseek.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/lseek.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lseek.s"
 
 /* C library -- lseek						*/
 /* off_t lseek(int fildes, off_t offset, int whence);		*/
--- a/usr/src/lib/libc/common/sys/lstat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/lstat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lstat.s"
 
 /* C library -- lstat						*/
 /* error = lstat(const char *path, struct lstat *buf)		*/
--- a/usr/src/lib/libc/common/sys/memcntl.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/memcntl.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcntl.s"
 
 /* C library -- memcntl	*/
 /* int memcntl(caddr_t addr, size_t len, int cmd,
--- a/usr/src/lib/libc/common/sys/mincore.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/mincore.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"mincore.s"
 
 /* C library -- mincore						*/
 /* int mincore(caddr_t addr, size_t len, char *vec)		*/
--- a/usr/src/lib/libc/common/sys/mkdir.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/mkdir.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"mkdir.s"
 
 /* C library -- mkdir						*/
 /* int mkdir (const char *path, mode_t mode);			*/
--- a/usr/src/lib/libc/common/sys/mknod.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/mknod.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"mknod.s"
 
 /* C library -- mknod						*/
 /* int mknod(const char *path, mode_t mode, dev_t dev);		*/
--- a/usr/src/lib/libc/common/sys/mmap.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/mmap.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"mmap.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/common/sys/modctl.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/modctl.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"modctl.s"
 
 /* C library -- modctl						*/
 /* int modctl(int opcode, char *arg)				*/
--- a/usr/src/lib/libc/common/sys/mount.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/mount.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"mount.s"
 
 /* C library -- mount						*/
 /* int mount(const char *spec, const char *dir, int mflag,
--- a/usr/src/lib/libc/common/sys/mprotect.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/mprotect.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"mprotect.s"
 
 /* C library -- mprotect					*/
 /* int mprotect(caddr_t addr, size_t len, int prot)		*/
--- a/usr/src/lib/libc/common/sys/munmap.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/munmap.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"munmap.s"
 
 /* C library -- munmap						*/
 /* int munmap(caddr_t addr, size_t len)				*/
--- a/usr/src/lib/libc/common/sys/nice.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/nice.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"nice.s"
 
 /* C library -- nice						*/
 /* int nice (int incr);						*/
--- a/usr/src/lib/libc/common/sys/ntp_adjtime.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/ntp_adjtime.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"ntp_adjtime.s"
 
 /* C library -- ntp_adjtime					*/
 /* int ntp_adjtime (struct timex *);				*/
--- a/usr/src/lib/libc/common/sys/ntp_gettime.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/ntp_gettime.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"ntp_gettime.s"
 
 /* C library -- ntp_gettime					*/
 /* int ntp_gettime (struct ntptimeval *);			*/
--- a/usr/src/lib/libc/common/sys/open.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/open.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"open.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/p_online.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/p_online.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"p_online.s"
 
 /*
  * C library -- p_online
--- a/usr/src/lib/libc/common/sys/pathconf.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/pathconf.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"pathconf.s"
 
 /* C library -- pathconf					*/
 /* long pathconf(char *path, int name)				*/
--- a/usr/src/lib/libc/common/sys/pause.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/pause.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"pause.s"
 
 /* C library - pause						*/
 /* int __pause(void);						*/
--- a/usr/src/lib/libc/common/sys/pcsample.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/pcsample.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"pcsample.s"
 
 /* C library -- pcsample */
 /* long pcsample(uintptr_t buf[], long nsamples); */
--- a/usr/src/lib/libc/common/sys/pollsys.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/pollsys.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"pollsys.s"
 
 /*
  * C library -- __pollsys
--- a/usr/src/lib/libc/common/sys/pread.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/pread.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"pread.s"
 
 /* C library -- pread					*/
 /* ssize_t __pread(int, void *, size_t, off_t);		*/
--- a/usr/src/lib/libc/common/sys/priocntlset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/priocntlset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"priocntlset.s"
 
 /* C library -- priocntlset					*/
 /* long priocntlset(procset_t psp, int cmd, int arg)		*/
--- a/usr/src/lib/libc/common/sys/processor_bind.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/processor_bind.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"processor_bind.s"
 
 /*
  * C library -- processor_bind
--- a/usr/src/lib/libc/common/sys/processor_info.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/processor_info.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"processor_info.s"
 
 /*
  * C library -- processor_info
--- a/usr/src/lib/libc/common/sys/profil.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/profil.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"profil.s"
 
 /* C library -- profil						*/
 /* void profil (short *buff, int buffsz, int offset, int scale);*/
--- a/usr/src/lib/libc/common/sys/putmsg.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/putmsg.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"putmsg.s"
 
 /* C library -- putmsg						*/
 /* int __putmsg(int fd, struct const strbuf *ctlptr,		*/
--- a/usr/src/lib/libc/common/sys/putpmsg.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/putpmsg.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"putpmsg.s"
 
 /* C library -- putpmsg						*/
 /* int __putpmsg(int fd, struct const strbuf *ctlptr,		*/
--- a/usr/src/lib/libc/common/sys/pwrite.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/pwrite.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"pwrite.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/read.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/read.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"read.s"
 
 /* C library -- read						*/
 /* ssize_t __read(int fildes, void *buf, size_t nbyte);		*/
--- a/usr/src/lib/libc/common/sys/readlink.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/readlink.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"readlink.s"
 
 /*
  * C library -- readlink
--- a/usr/src/lib/libc/common/sys/readv.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/readv.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"readv.s"
 
 /* C library -- readv							*/
 /* ssize_t __readv(int fd, const struct iovec *iovp, int iovcnt)	*/
--- a/usr/src/lib/libc/common/sys/rename.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/rename.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"rename.s"
 
 /* C library -- rename						*/
 /* int rename(const char *old, const char *new);		*/
--- a/usr/src/lib/libc/common/sys/resolvepath.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/resolvepath.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"resolvepath.s"
 
 /* C library -- resolvepath					*/
 /* int resolvepath(const char *path, void *buf, int bufsiz)	*/
--- a/usr/src/lib/libc/common/sys/rmdir.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/rmdir.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"rmdir.s"
 
 /* C library -- rmdir						*/
 /* int rmdir (const char *path);				*/
--- a/usr/src/lib/libc/common/sys/seteguid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/seteguid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"seteguid.s"
 
 /* C library -- setegid, seteuid				*/
 /* int setegid (gid_t gid)					*/
--- a/usr/src/lib/libc/common/sys/setgid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/setgid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setgid.s"
 
 /* C library -- setgid						*/
 /* int setgid(gid_t gid);					*/
--- a/usr/src/lib/libc/common/sys/setgroups.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/setgroups.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setgroups.s"
 
 /* C library -- setgroups					*/
 /* int setgroups(int ngroups, uid_t grouplist[])		*/
--- a/usr/src/lib/libc/common/sys/setitimer.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/setitimer.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setitimer.s"
 
 /* C library -- setitimer					*/
 /* int setitimer (int, const struct itimerval *, struct itimerval *);	*/
--- a/usr/src/lib/libc/common/sys/setreid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/setreid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setreid.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/common/sys/setrlimit.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/setrlimit.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setrlimit.s"
 
 /* C library -- setrlimit					*/
 /* int setrlimit(int resource, const struct rlimit *rlp)	*/
--- a/usr/src/lib/libc/common/sys/setuid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/setuid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setuid.s"
 
 /* C library -- setuid						*/
 /* int setuid (uid_t uid);					*/
--- a/usr/src/lib/libc/common/sys/sigaltstk.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/sigaltstk.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sigaltstk.s"
 
 /* C library -- sigaltstack					*/
 /* int sigaltstack (stack_t *ss, stack_t *oss);			*/
--- a/usr/src/lib/libc/common/sys/sigprocmsk.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/sigprocmsk.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sigprocmsk.s"
 
 /* C library -- sigprocmask					*/
 /* int sigprocmask (int how, sigset_t *set, sigset_t *oset)	*/
--- a/usr/src/lib/libc/common/sys/sigsendset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/sigsendset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sigsendset.s"
 
 /* C library -- sigsendset					*/
 /* int sigsendset(procset_t *psp, int sig)			*/
--- a/usr/src/lib/libc/common/sys/sigsuspend.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/sigsuspend.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sigsuspend.s"
 
 /* C library -- sigsuspend trap					*/
 /* int __sigsuspend (sigset_t *set);				*/
--- a/usr/src/lib/libc/common/sys/stat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/stat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"stat.s"
 
 /* C library -- stat						*/
 /* int stat (const char *path, struct stat *buf);		*/
--- a/usr/src/lib/libc/common/sys/statfs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/statfs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"statfs.s"
 
 /* C library -- statfs						*/
 /* int statfs (const char *path, struct statfs *buf, int len,	*/
--- a/usr/src/lib/libc/common/sys/statvfs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/statvfs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"statvfs.s"
 
 /* C library -- statvfs						*/
 /* int statvfs(const char *path, struct statvfs *statbuf)	*/
--- a/usr/src/lib/libc/common/sys/stty.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/stty.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"stty.s"
 
 /* C library -- stty						*/
 /* int stty (char *path, struct ?? buf, int len);		*/
--- a/usr/src/lib/libc/common/sys/symlink.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/symlink.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"symlink.s"
 
 /* C library -- symlink						*/
 /* int symlink(const char *name1, const char *name2)		*/
--- a/usr/src/lib/libc/common/sys/sync.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/sync.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sync.s"
 
 /* C library -- sync						*/
 /* void sync (void);						*/
--- a/usr/src/lib/libc/common/sys/sysconfig.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/sysconfig.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sysconfig.s"
 
 /* C library -- _sysconfig					*/
 /* int _sysconfig(name)						*/
--- a/usr/src/lib/libc/common/sys/sysfs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/sysfs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sysfs.s"
 
 /* C library -- sysfs						*/
 /* int sysfs (int opcode, const char *fsname);			*/
--- a/usr/src/lib/libc/common/sys/sysinfo.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/sysinfo.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sysinfo.s"
 
 /* C library -- sysinfo						*/
 /* int sysinfo(cmd, buf, count)					*/
--- a/usr/src/lib/libc/common/sys/syslwp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/syslwp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"syslwp.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/times.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/times.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"times.s"
 
 /* C library -- times						*/
 /* long times (struct tms *buffer);				*/
--- a/usr/src/lib/libc/common/sys/ulimit.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/ulimit.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"ulimit.s"
 
 /* C library -- ulimit						*/
 /* long ulimit (int cmd, long newlimit);			*/
--- a/usr/src/lib/libc/common/sys/umask.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/umask.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"umask.s"
 
 /* C library -- umask						*/
 /* mode_t umask (mode_t cmask);					*/
--- a/usr/src/lib/libc/common/sys/umount2.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/umount2.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"umount2.s"
 
 /* C library -- umount2						*/
 /* int umount2 (const char *file, int flag);			*/
--- a/usr/src/lib/libc/common/sys/unlink.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/unlink.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"unlink.s"
 
 /* C library -- unlink						*/
 /* int unlink (const char *path);				*/
--- a/usr/src/lib/libc/common/sys/utime.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/utime.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -28,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"utime.s"
 
 /* C library -- utime						*/
 /* int utime (const char *path, const struct utimbuf *times);	*/
--- a/usr/src/lib/libc/common/sys/utimes.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/utimes.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"utimes.s"
 
 /* C library -- utimes						*/
 /* int utimes (const char *path, const struct timeval *times);	*/
--- a/usr/src/lib/libc/common/sys/utssys.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/utssys.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"utssys.s"
 
 /* C library -- utssys						*/
 /* error = utssys(cbuf, mv, type, outbufp)			*/
--- a/usr/src/lib/libc/common/sys/uucopy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/uucopy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"uucopy.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/common/sys/vhangup.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/vhangup.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"vhangup.s"
 
 /* C library -- vhangup						*/
 /* int vhangup()						*/
--- a/usr/src/lib/libc/common/sys/waitid.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/waitid.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"waitid.s"
 
 /* C library -- waitid						*/
 /* int waitid(idtype_t idtype, id_t id, siginfo_t *infop,
--- a/usr/src/lib/libc/common/sys/write.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/write.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"write.s"
 
 /* C library -- write						*/
 /* ssize_t __write(int fildes, const void *buf, size_t nbyte);	*/
--- a/usr/src/lib/libc/common/sys/writev.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/writev.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"writev.s"
 
 /* C library -- writev 							*/
 /* ssize_t __writev(int fd, const struct iovec *iovp, int iovcnt)	*/
--- a/usr/src/lib/libc/common/sys/yield.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/common/sys/yield.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"yield.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/crt/_rtboot.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/crt/_rtboot.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_rtboot.s"
 
 / bootstrap routine for run-time linker
 / we get control from exec which has loaded our text and
--- a/usr/src/lib/libc/i386/crt/cerror.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/crt/cerror.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"cerror.s"
 
 / C return sequence which sets errno, returns -1.
 
--- a/usr/src/lib/libc/i386/crt/cerror64.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/crt/cerror64.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"cerror64.s"
 
 / C return sequence which sets errno, returns -1.
 
--- a/usr/src/lib/libc/i386/fp/_xtoll.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/fp/_xtoll.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_xtoll.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/i386/fp/_xtoull.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/fp/_xtoull.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_xtoull.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/i386/fp/fpcw.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/fp/fpcw.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpcw.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/i386/gen/_div64.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/_div64.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_div64.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/gen/_divdi3.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/_divdi3.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -25,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_divdi3.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/i386/gen/_getsp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/_getsp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_getsp.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/gen/_mul64.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/_mul64.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_mul64.s"
 
 /
 /   function __mul64(A,B:Longint):Longint;
--- a/usr/src/lib/libc/i386/gen/_stack_grow.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/_stack_grow.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_stack_grow.s"
 
 /* 
  * void *
--- a/usr/src/lib/libc/i386/gen/abs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/abs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -25,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"abs.s"
 
 /	/* Assembler program to implement the following C program */
 /	int
--- a/usr/src/lib/libc/i386/gen/alloca.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/alloca.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"alloca.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/gen/byteorder.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/byteorder.s	Wed Aug 06 16:29:39 2008 -0600
@@ -23,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"byteorder.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/gen/cuexit.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/cuexit.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"cuexit.s"
 
 / C library -- exit
 / exit(code)
--- a/usr/src/lib/libc/i386/gen/ladd.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/ladd.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"ladd.s"
 
 / Double long add routine.
 
--- a/usr/src/lib/libc/i386/gen/ldivide.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/ldivide.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"ldivide.s"
 
 / Double long divide routine.
 
--- a/usr/src/lib/libc/i386/gen/lmul.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/lmul.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lmul.s"
 
 / Double long multiply routine.
 
--- a/usr/src/lib/libc/i386/gen/lock.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/lock.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lock.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/gen/lshiftl.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/lshiftl.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lshiftl.s"
 
 / Shift a double long value.
 
--- a/usr/src/lib/libc/i386/gen/lsign.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/lsign.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lsign.s"
 
 / Determine the sign of a double-long number.
 
--- a/usr/src/lib/libc/i386/gen/lsub.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/lsub.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lsub.s"
 
 / Double long subtraction routine.
 
--- a/usr/src/lib/libc/i386/gen/memccpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/memccpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memccpy.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/i386/gen/memchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/memchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memchr.s"
 
 /
 / memchr(sptr, c1, n)
--- a/usr/src/lib/libc/i386/gen/memcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/memcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcmp.s"
 
 /
 / memcmp(s1, s2, n)
--- a/usr/src/lib/libc/i386/gen/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/i386/gen/memset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/memset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memset.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/i386/gen/setjmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/setjmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setjmp.s"
 
 /	longjmp(env, val)
 / will generate a "return(val)" from
--- a/usr/src/lib/libc/i386/gen/strcat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/strcat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcat.s"
 
 /
 / strcat(s1, s2)
--- a/usr/src/lib/libc/i386/gen/strchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/strchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strchr.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/gen/strcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/strcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcpy.s"
 
 /
 / strcpy(s1, s2)
--- a/usr/src/lib/libc/i386/gen/strlen.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/strlen.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strlen.s"
 
 /
 / strlen(s)
--- a/usr/src/lib/libc/i386/gen/strncat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/strncat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncat.s"
 
 /
 / strncat(s1, s2, n)
--- a/usr/src/lib/libc/i386/gen/strncmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/strncmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncmp.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/gen/strncpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/strncpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncpy.s"
 
 /
 / strncpy(s1, s2, n)
--- a/usr/src/lib/libc/i386/gen/strrchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/strrchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strrchr.s"
 
 /
 / strrchr(sp, c)
--- a/usr/src/lib/libc/i386/gen/wschr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/wschr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"wschr.s"
 
 /
 / Wide character wcschr() implementation
--- a/usr/src/lib/libc/i386/gen/wslen.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/wslen.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"wslen.s"
 
 /*
  * Wide character wcslen() implementation
--- a/usr/src/lib/libc/i386/gen/wsncmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/gen/wsncmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"wsncmp.s"
 
 /
 / Wide character wcsncpy() implementation
--- a/usr/src/lib/libc/i386/sys/__clock_gettime.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/__clock_gettime.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__clock_gettime.s"
 
 #include <sys/time_impl.h>
 #include "SYS.h"
--- a/usr/src/lib/libc/i386/sys/__getcontext.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/__getcontext.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__getcontext.s"
 
 /*
  * __getcontext() must be implemented in assembler, as opposed
--- a/usr/src/lib/libc/i386/sys/__uadmin.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/__uadmin.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__uadmin.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/sys/_lwp_mutex_unlock.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/_lwp_mutex_unlock.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_lwp_mutex_unlock.s"
 
 #include "SYS.h"
 #include <../assym.h>
--- a/usr/src/lib/libc/i386/sys/door.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/door.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"door.s"
 
 #include "SYS.h"
 #include <sys/door.h>
--- a/usr/src/lib/libc/i386/sys/forkallx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/forkallx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"forkallx.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/sys/forkx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/forkx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"forkx.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/sys/fxstat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/fxstat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fxstat.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/sys/getcontext.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/getcontext.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"getcontext.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/i386/sys/gettimeofday.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/gettimeofday.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"gettimeofday.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/sys/lwp_private.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/lwp_private.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lwp_private.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/sys/lxstat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/lxstat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lxstat.s"
 
 / int
 / _lxstat(_STAT_VER, _path, _buf);
--- a/usr/src/lib/libc/i386/sys/nuname.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/nuname.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"nuname.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/sys/pipe.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/pipe.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"pipe.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/i386/sys/syscall.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/syscall.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"syscall.s"
 
 #include "SYS.h"
 #include <sys/trap.h>
--- a/usr/src/lib/libc/i386/sys/sysi86.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/sysi86.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sysi86.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/i386/sys/uname.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/uname.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"uname.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/i386/sys/vforkx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/vforkx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"vforkx.s"
 
 #include "SYS.h"
 #include <assym.h>
--- a/usr/src/lib/libc/i386/sys/xmknod.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/xmknod.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"xmknod.s"
 
 / OS library -- _xmknod
 
--- a/usr/src/lib/libc/i386/sys/xstat.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/sys/xstat.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"xstat.s"
 
 / OS library -- _xstat
 
--- a/usr/src/lib/libc/i386/threads/asm_subr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/threads/asm_subr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"asm_subr.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/i386/threads/tls_get_addr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/threads/tls_get_addr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"tls_get_addr.s"
 
 /*
  * To make thread-local storage accesses as fast as possible, we
--- a/usr/src/lib/libc/i386/unwind/unwind_frame.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386/unwind/unwind_frame.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"unwind_frame.s"
 
 #include <SYS.h>
 
--- a/usr/src/lib/libc/i386_hwcap1/gen/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386_hwcap1/gen/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/i386_hwcap1/gen/memset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/i386_hwcap1/gen/memset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memset.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparc/crt/hwmuldiv.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/crt/hwmuldiv.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"hwmuldiv.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparc/fp/_Q_get_rp_rd.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/fp/_Q_get_rp_rd.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_Q_get_rp_rd.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparc/fp/fpgetmask.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/fp/fpgetmask.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpgetmask.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparc/fp/fpgetrnd.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/fp/fpgetrnd.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpgetrnd.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparc/fp/fpgetsticky.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/fp/fpgetsticky.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpgetsticky.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparc/fp/fpsetmask.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/fp/fpsetmask.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpsetmask.s"
 
 /*
  * fp_except fpsetmask(mask)
--- a/usr/src/lib/libc/sparc/fp/fpsetrnd.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/fp/fpsetrnd.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpsetrnd.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparc/fp/fpsetsticky.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/fp/fpsetsticky.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpsetsticky.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparc/gen/_stack_grow.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/_stack_grow.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_stack_grow.s"
 
 #include "SYS.h"
 #include <../assym.h>
--- a/usr/src/lib/libc/sparc/gen/ladd.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/ladd.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"ladd.s"
 
 /*
  * Double long add routine.  Ported from pdp 11/70 version
--- a/usr/src/lib/libc/sparc/gen/lock.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/lock.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lock.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparc/gen/lshiftl.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/lshiftl.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lshiftl.s"
 
 /*
  * Shift a double long value. Ported from m32 version to sparc.
--- a/usr/src/lib/libc/sparc/gen/lsign.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/lsign.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lsign.s"
 
 /*
  * Determine the sign of a double-long number.
--- a/usr/src/lib/libc/sparc/gen/lsub.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/lsub.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"lsub.s"
 
 /*
  * Double long subtraction routine.  Ported from pdp 11/70 version
--- a/usr/src/lib/libc/sparc/gen/memchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/memchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memchr.s"
 
 /*
  * Return the ptr in sptr at which the character c1 appears;
--- a/usr/src/lib/libc/sparc/gen/memcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/memcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcmp.s"
 
 /*
  * memcmp(s1, s2, len)
--- a/usr/src/lib/libc/sparc/gen/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 /*
  * memcpy(s1, s2, len)
--- a/usr/src/lib/libc/sparc/gen/memmove.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/memmove.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memmove.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparc/gen/memset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/memset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memset.s"
 
 /*
  * char *memset(sp, c, n)
--- a/usr/src/lib/libc/sparc/gen/setjmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/setjmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setjmp.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparc/gen/strcasecmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/strcasecmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcasecmp.s"
 /*
  * The strcasecmp() function is a case insensitive versions of strcmp().
  * It assumes the ASCII character set and ignores differences in case
--- a/usr/src/lib/libc/sparc/gen/strchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/strchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strchr.s"
 
 /*
  * The strchr() function returns a pointer to the first occurrence of c 
--- a/usr/src/lib/libc/sparc/gen/strcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/strcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcmp.s"
 
 /* strcmp(s1, s2)
  *
--- a/usr/src/lib/libc/sparc/gen/strcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/strcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcpy.s"
 
 /*
  * strcpy(s1, s2)
--- a/usr/src/lib/libc/sparc/gen/strlcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/strlcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strlcpy.s"
 /*
  * The strlcpy() function copies at most dstsize-1 characters
  * (dstsize being the size of the string buffer dst) from src
--- a/usr/src/lib/libc/sparc/gen/strlen.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/strlen.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strlen.s"
 
 /*
  * strlen(s)
--- a/usr/src/lib/libc/sparc/gen/strncmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/strncmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncmp.s"
 
 /*
  * strncmp(s1, s2, n)
--- a/usr/src/lib/libc/sparc/gen/strncpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/strncpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncpy.s"
 
 /*
  * strncpy(s1, s2)
--- a/usr/src/lib/libc/sparc/gen/sync_instruction_memory.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/gen/sync_instruction_memory.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * All rights reserved.
  */
 
-.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sync_instruction_memory.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparc/sys/__clock_gettime.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/__clock_gettime.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__clock_gettime.s"
 
 #include <sys/time_impl.h>
 #include "SYS.h"
--- a/usr/src/lib/libc/sparc/sys/__getcontext.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/__getcontext.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__getcontext.s"
 
 /*
  * __getcontext() must be implemented in assembler, as opposed
--- a/usr/src/lib/libc/sparc/sys/_lwp_mutex_unlock.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/_lwp_mutex_unlock.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_lwp_mutex_unlock.s"
 
 #include "SYS.h"
 #include <../assym.h>
--- a/usr/src/lib/libc/sparc/sys/door.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/door.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"door.s"
 
 #include "SYS.h"
 #include <sys/door.h>
--- a/usr/src/lib/libc/sparc/sys/forkallx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/forkallx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"forkallx.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparc/sys/forkx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/forkx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"forkx.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparc/sys/gettimeofday.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/gettimeofday.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"gettimeofday.s"
 
 /*
  * C library -- gettimeofday
--- a/usr/src/lib/libc/sparc/sys/syscall.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/syscall.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,8 +27,6 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * C library -- int syscall(int sysnum, ...);
  * C library -- int __systemcall(sysret_t *, int sysnum, ...);
@@ -45,7 +43,7 @@
  * use it here because this code is shared between sparcv8 and sparcv9.
  */
 
-	.file	"%M%"
+	.file	"syscall.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparc/sys/vforkx.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/sys/vforkx.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"vforkx.s"
 
 #include "SYS.h"
 #include <assym.h>
--- a/usr/src/lib/libc/sparc/threads/asm_subr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/threads/asm_subr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"asm_subr.s"
 
 #include "SYS.h"
 #include <sys/trap.h>
--- a/usr/src/lib/libc/sparc/threads/tls_get_addr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/threads/tls_get_addr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"tls_get_addr.s"
 
 #include "SYS.h"
 #include <../assym.h>
--- a/usr/src/lib/libc/sparc/unwind/unwind_frame.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparc/unwind/unwind_frame.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"unwind_frame.s"
 
 #include "SYS.h"
 #include <../assym.h>
--- a/usr/src/lib/libc/sparcv9/crt/__align_cpy_2.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/crt/__align_cpy_2.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__align_cpy_2.s"
 
 /*
  * __align_cpy_2(s1, s2, len)
--- a/usr/src/lib/libc/sparcv9/crt/__align_cpy_4.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/crt/__align_cpy_4.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__align_cpy_4.s"
 
 /* __align_cpy_4(s1, s2, n)
  *
--- a/usr/src/lib/libc/sparcv9/crt/__align_cpy_8.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/crt/__align_cpy_8.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"__align_cpy_8.s"
 
 /* __align_cpy_8(s1, s2, n)
  *
--- a/usr/src/lib/libc/sparcv9/crt/cerror.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/crt/cerror.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"cerror.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparcv9/fp/_Q_get_rp_rd.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/fp/_Q_get_rp_rd.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"_Q_get_rp_rd.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparcv9/fp/fpgetmask.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/fp/fpgetmask.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpgetmask.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparcv9/fp/fpgetrnd.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/fp/fpgetrnd.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpgetrnd.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparcv9/fp/fpgetsticky.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/fp/fpgetsticky.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpgetsticky.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparcv9/fp/fpsetmask.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/fp/fpsetmask.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpsetmask.s"
 
 /*
  * fp_except fpsetmask(mask)
--- a/usr/src/lib/libc/sparcv9/fp/fpsetrnd.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/fp/fpsetrnd.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpsetrnd.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparcv9/fp/fpsetsticky.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/fp/fpsetsticky.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"fpsetsticky.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparcv9/gen/abs.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/abs.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"abs.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc/sparcv9/gen/alloca.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/alloca.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * All rights reserved.
  */
 
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"alloca.s"
 
 #include <sys/asm_linkage.h>
 #include <sys/stack.h>
--- a/usr/src/lib/libc/sparcv9/gen/memchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/memchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memchr.s"
 
 /*
  * Return the ptr in sptr at which the character c1 appears;
--- a/usr/src/lib/libc/sparcv9/gen/memcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/memcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcmp.s"
 
 /*
  * memcmp(s1, s2, len)
--- a/usr/src/lib/libc/sparcv9/gen/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 /*
  * memcpy(s1, s2, len)
--- a/usr/src/lib/libc/sparcv9/gen/memmove.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/memmove.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memmove.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparcv9/gen/memset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/memset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memset.s"
 
 /*
  * memset(sp, c, n)
--- a/usr/src/lib/libc/sparcv9/gen/setjmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/setjmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -27,9 +27,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setjmp.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparcv9/gen/strcasecmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/strcasecmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcasecmp.s"
 
 /*
  * The strcasecmp() function is a case insensitive versions of strcmp().
--- a/usr/src/lib/libc/sparcv9/gen/strchr.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/strchr.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strchr.s"
 
 /*
  * The strchr() function returns a pointer to the first occurrence of c 
--- a/usr/src/lib/libc/sparcv9/gen/strcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/strcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcmp.s"
 
 /* strcmp(s1, s2)
  *
--- a/usr/src/lib/libc/sparcv9/gen/strcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/strcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strcpy.s"
 
 /*
  * strcpy(s1, s2)
--- a/usr/src/lib/libc/sparcv9/gen/strlcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/strlcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strlcpy.s"
 
 /*
  * The strlcpy() function copies at most dstsize-1 characters
--- a/usr/src/lib/libc/sparcv9/gen/strlen.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/strlen.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strlen.s"
 
 /*
  * strlen(s)
--- a/usr/src/lib/libc/sparcv9/gen/strncmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/strncmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncmp.s"
 
 /*
  * strncmp(s1, s2, n)
--- a/usr/src/lib/libc/sparcv9/gen/strncpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/strncpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"strncpy.s"
 
 /*
  * strncpy(s1, s2)
--- a/usr/src/lib/libc/sparcv9/gen/sync_instruction_memory.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/gen/sync_instruction_memory.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * All rights reserved.
  */
 
-.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sync_instruction_memory.s"
 
 #include <sys/asm_linkage.h>
 
--- a/usr/src/lib/libc/sparcv9/sys/sparc_utrap_install.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc/sparcv9/sys/sparc_utrap_install.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -24,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sparc_utrap_install.s"
 
 #include "SYS.h"
 
--- a/usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 /*
  * memcpy(s1, s2, len)
--- a/usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcmp.s"
 
 /*
  * memcmp(s1, s2, len)
--- a/usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 /*
  * memcpy(s1, s2, len)
--- a/usr/src/lib/libc_psr/sun4u-us3/common/memset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4u-us3/common/memset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memset.s"
 
 /*
  * char *memset(sp, c, n)
--- a/usr/src/lib/libc_psr/sun4u/common/memcmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4u/common/memcmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcmp.s"
 
 /*
  * memcmp(s1, s2, len)
--- a/usr/src/lib/libc_psr/sun4u/common/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4u/common/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 /*
  * memcpy(s1, s2, len)
--- a/usr/src/lib/libc_psr/sun4u/common/memset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4u/common/memset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memset.s"
 
 /*
  * char *memset(sp, c, n)
--- a/usr/src/lib/libc_psr/sun4v/common/memcpy.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4v/common/memcpy.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memcpy.s"
 
 /*
  * memcpy(s1, s2, len)
--- a/usr/src/lib/libc_psr/sun4v/common/memset.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libc_psr/sun4v/common/memset.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"memset.s"
 
 /*
  * char *memset(sp, c, n)
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ActiveDiscoverer.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ActiveDiscoverer.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ActiveDiscoverer.java: Object to perform active DA discovery.
 //  Author:           James Kempf
 //  Created On:       Thu Sep  3 08:45:21 1998
@@ -46,7 +42,6 @@
  * sending out a SrvRqst for "service:directory-agent". Replies are
  * entered into the DA table.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/Advertiser.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/Advertiser.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceAgent.java: Interface for the SLP Service Agent operations
 //  Author:           James Kempf
 //  Created On:       Mon Jul  7 09:05:40 1997
@@ -46,7 +42,6 @@
  *
  * @see ServiceLocationManager
  *
- * @version %R%.%L% %D%
  * @author James Kempf, Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/Assert.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/Assert.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
- *
  */
 
 //
-// %M% : Handles assertions in a central fashion.
+// Assert.java : Handles assertions in a central fashion.
 //
 //  Author:           Erik Guttman
 //
@@ -44,7 +40,6 @@
  * execution if the assertion fails.
  *
  * @author  Erik Guttman
- * @version %W% %G%
  */
 
 class Assert {
--- a/usr/src/lib/libslp/javalib/com/sun/slp/AttributeDescriptor.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/AttributeDescriptor.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  AttributeDescriptor.java: Describes an SLP attribute.
 //  Author:           James Kempf
 //  Created On:       Thu Jun 19 10:38:01 1997
@@ -47,7 +43,6 @@
  * information is primarily for GUI tools. Programmatic attribute
  * verification should be done through the ServiceLocationAttributeVerifier.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  *
  */
--- a/usr/src/lib/libslp/javalib/com/sun/slp/AttributePattern.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/AttributePattern.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)AttributePattern.java	1.1	02/18/98
 //  AttributePattern.java: Models a pattern for attribute matching.
 //  Author:           James Kempf
 //  Created On:       Tue Feb  3 15:26:30 1998
@@ -49,7 +45,6 @@
  * string pattern. A PatternPart may be lacking the
  * any of these, but will always have at least one. 
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
@@ -65,7 +60,6 @@
      * pattern in the middle. Any of the parts may be missing, but it will 
      * always have at least one. 
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/AttributeString.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/AttributeString.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  AttributeString.java: Model an Attribute value string.
 //  Author:           James Kempf
 //  Created On:       Wed Apr  8 10:40:03 1998
@@ -48,7 +44,6 @@
  * The toString() method returns the original string. Note that it does
  * NOT handle pattern wildcard matching. 
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/AttributeVerifier.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/AttributeVerifier.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999-2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)AttributeVerifier.java	1.3	06/25/98
 //  AttributeVerifier.java: An attribute verifier for SLP attributes. 
 //  Author:           James Kempf
 //  Created On:       Thu Jun 19 10:51:32 1997
@@ -53,7 +49,6 @@
  * space utilization by lazily evaluating portions of the attribute 
  * template.
  *
- * @version 1.3 98/10/14
  * @author James Kempf
  *
  */
--- a/usr/src/lib/libslp/javalib/com/sun/slp/CAttrMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/CAttrMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status: %W% %G% 
 //  CAttrMsg.java: Message class for SLP attribute
 //                 reply.  
 //  Author: James Kempf Created On: Thu Oct 9 15:17:36 1997 
@@ -45,7 +41,6 @@
 /**
  * The CAttrMsg class models the SLP client side attribute message.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/CDAAdvert.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/CDAAdvert.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  CDAAdvert.java:    Message class for SLP CDAAdvert message
 //  Author:           James Kempf
 //  Created On:       Fri Oct 10 10:48:05 1997
@@ -46,7 +42,6 @@
  * The CDAAdvert class models the SLP DAAdvert message, client side.
  * We need to accommodate SLPv1 by using an initialize() method.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/CSAAdvert.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/CSAAdvert.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  CSAAdvert.java:    Message class for SLP CSAAdvert message
 //  Author:           James Kempf
 //  Created On:       Fri Oct 10 10:48:05 1997
@@ -45,7 +41,6 @@
 /**
  * The CSAAdvert class models the SLP SAAdvert message, client side.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/CSrvDereg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/CSrvDereg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  CSrvDereg.java:   Client side Service Deregistration
 //  Author:           James Kempf
 //  Created On:       Tue Feb 10 13:17:41 1998
@@ -45,7 +41,6 @@
 /**
  * The SrvDeReg class models the server side SLP service deregistration. 
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/CSrvMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/CSrvMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  CSrvMsg.java:     Message class for SLP service reply.
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 15:09:32 1997
@@ -44,7 +40,6 @@
 /**
  * The CSrvMsg class models the SLP client side service message.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/CSrvReg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/CSrvReg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  CSrvReg.java:    Service Registration, Client Side.
 //  Author:           James Kempf
 //  Created On:       Tue Feb 10 12:15:43 1998
@@ -46,7 +42,6 @@
  * The CSrvReg class models the client side SLP service registration 
  * message. 
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/CSrvTypeMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/CSrvTypeMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  CSrvTypeMsg.java: Message class for SLP service type reply
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 16:15:36 1997
@@ -45,7 +41,6 @@
 /**
  * The CSrvTypeMsg class models the SLP service type reply message. 
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ClientMsgManager.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ClientMsgManager.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ClientMsgManager.java:Manages versioned client message creation in server
 //  Author:           James Kempf
 //  Created On:       Thu Sep 17 10:16:33 1998
@@ -49,7 +45,6 @@
  * sets the header variables. It is up to the caller to set the 
  * instance variables in the object itself.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/DAAdvertiser.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/DAAdvertiser.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  DAAdvertiser.java: Advertise a DA, also handle incoming DAAdverts.
 //  Author:           James Kempf
 //  Created On:       Tue May 19 15:22:04 1998
@@ -49,7 +45,6 @@
  * implementation specific subclasses depend on how the server is
  * representing DA information internally.
  *
- * @version %R%.%L% %D%
  * @author James Kempf, Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/DATable.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/DATable.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001,2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  DATable.java:     Interface for DATables.
 //  Author:           James Kempf
 //  Created On:       Mon May 11 13:46:02 1998
@@ -44,7 +40,6 @@
  * and scope discovery. A variety of implementations are possible.
  * The getDATable() method creates the right one from a subclass.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
@@ -75,7 +70,6 @@
     /**
      * A record for all DAs supporting exactly the same set of scopes.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/Defaults.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/Defaults.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-// SCCS Status:
 // Defaults.java : Defaults for SLP Locator, Advertiser and slpd.
 // Author:   Erik Guttman
 //
@@ -40,7 +36,6 @@
 /**
  * This class gathers all constants used in the package into one place.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/IANACharCode.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/IANACharCode.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  IANACharCode.java: SLPv1 Character encoding support
 //  Author:           James Kempf
 //  Created On:       Fri Sep 11 13:24:02 1998
@@ -49,7 +45,6 @@
  * of character codings into the integer codes. Ideally, Java itself
  * should support this.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/Listener.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/Listener.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  Listener.java:    Organize basic listening for slpd and specifically
 //                    support datagram listening.
 //  Author:           James Kempf
@@ -54,7 +50,6 @@
  * may also enter through this class, since many systems don't distinguish
  * between the multicast and datagram queues for a port.
  *
- * @version %R%.%L% %D%
  * @author James Kempf, Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/Locator.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/Locator.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)Locator.java	2.2	10/07/97
 //  UserAgent.java:   Interface for the SLP User Agent operations
 //  Author:           James Kempf
 //  Created On:       Mon Jul  7 09:15:56 1997
@@ -47,7 +43,6 @@
  *
  * @see ServiceLocationManager
  *
- * @version %R%.%L% %D%
  * @author James Kempf, Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/Opaque.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/Opaque.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  Opaque.java:   Wrapper for byte[].
 //  Author:           James Kempf
 //  Created On:       Tue Apr  7 15:21:58 1998
@@ -45,7 +41,6 @@
  * The Opaque class wraps Java byte arrays so we can do object-like
  * things, such as deep equality comparison and printing.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/Parser.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/Parser.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001,2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  Parser.java:      LDAP Parser for those service stores that need it.
 //  Author:           James Kempf
 //  Created On:       Mon Apr 27 08:11:08 1998
@@ -46,7 +42,6 @@
  * It is an internal class because it must know about the internal
  * structure of the hashtables.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
@@ -72,7 +67,6 @@
     /**
      * Record for returning stuff to the service store.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -91,7 +85,6 @@
      * ServiceStore implemenations that want to use the Parser
      * class to perform query parsing must provide this.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/PermSARegTable.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/PermSARegTable.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  PermSARegTable.java: Periodically reregister registrations.
 //  Author:           James Kempf
 //  Created On:       Thu May 14 14:11:49 1998
@@ -45,7 +41,6 @@
 /**
  * Periodically reregister advertisments in the SA client.
  *
- * @version %R%.%L% %D%
  * @author Erik Guttman, James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/RequestHandler.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/RequestHandler.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  RequestHandler.java: Handle an incoming request in a separate thread.
 //  Author:           James Kempf
 //  Created On:       Mon May 18 14:00:27 1998
@@ -47,7 +43,6 @@
  * may have arrived via datagram, or it may have arrived via
  * stream.
  *
- * @version %R%.%L% %D%
  * @author James Kempf, Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SARequester.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SARequester.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SARequester.java: Requester operations for SA.
 //  Author:           James Kempf
 //  Created On:       Thu Jan  8 14:59:41 1998
@@ -47,7 +43,6 @@
  * by calling into the loopback I/O so the SA server does
  * the registration.
  *
- * @version %R%.%L% %D%
  * @author Erik Guttman, James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SAttrMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SAttrMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SAttrMsg.java:    Message class for SLP attribute request.
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 14:24:55 1997
@@ -47,7 +43,6 @@
  * Subclasses for other versions can specialize the
  * initialize() and makeReply() methods.
  *
- * @version %M%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SDAAdvert.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SDAAdvert.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SDAAdvert.java:   Server Side DAAdvert Message.
 //  Author:           James Kempf
 //  Created On:       Tue Feb 10 15:00:39 1998
@@ -45,7 +41,6 @@
 /**
  * The SDAAdvert class models the SLP DAAdvert message.
  *
- * @version 1.4 97/11/20
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPConfig.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPConfig.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 1999-2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      @(#)SLPConfig.java	2.4	10/07/97
 //  SLPConfig.java
 //
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPDgui.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPDgui.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
-//  %M : The service location daemon GUI.
+//  SLDPgui.java : The service location daemon GUI.
 //  Author:           Erik Guttman
 //
 
@@ -38,7 +34,6 @@
  * This GUI will allow the user of the slpd to monitor the daemon,
  * shut it off, manually enter services and stuff like that.
  *
- * @version %R%.%L% %D%
  * @author Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPHeaderV1.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPHeaderV1.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SLPHeaderV1.java: SLPv1 Header.
 //  Author:           James Kempf
 //  Created On:       Thu Sep 10 15:12:14 1998
@@ -44,7 +40,6 @@
 /**
  * The SLPHeaderV1 class models the SLPv1 server side header.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPHeaderV2.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPHeaderV2.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:       %W%	%G%
 //  SLPHeaderV2.java:   Base class for Service Location Messages
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 08:50:31 1997
@@ -48,7 +44,6 @@
  * It contains instance variables for SLP message header contents,
  * and implements the SLPHeaderV2 interface.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPServerHeaderV2.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPServerHeaderV2.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SLPServerHeaderV2.java: SLPv2 Header Class for Server Side
 //  Author:           James Kempf
 //  Created On:       Wed Sep 16 08:44:31 1998
@@ -48,7 +44,6 @@
  * The SLPServerHeaderV2 class serves as the header class for all server side
  * SLPv2 messages.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPTemplateRegistry.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPTemplateRegistry.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)SLPTemplateRegistry.java	1.2	06/12/98
 //  SLPTemplateRegistry.java: Service object for registering a new service
 //			  template.
 //  Author:           James Kempf
@@ -54,7 +50,6 @@
  *					  language=<language locale>
  *
  * @author James Kempf
- * @version 1.2 98/10/14
  *
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1CDAAdvert.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1CDAAdvert.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SLPV1CDAAdvert.java: SLP V1 compatible client side DAAdvert
 //  Author:           James Kempf
 //  Created On:       Fri Oct  9 14:20:16 1998
@@ -46,7 +42,6 @@
 /**
  * The SLPV1CDAAdvert class models the SLP V1 DAAdvert message, client side.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1Manager.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1Manager.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SLPV1Manager.java: Manages V1 Compatibility
 //  Author:           James Kempf
 //  Created On:       Wed Sep  9 09:51:40 1998
@@ -51,7 +47,6 @@
  * to handle an outgoing message, since each individual message type is
  * handled separately. SLPV1Manager also handles V1 defaults.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SAttrMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SAttrMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SLPV1SAttrMsg.java: SLPv1 Attribute request for server.
 //  Author:           James Kempf
 //  Created On:       Fri Sep 11 13:23:28 1998
@@ -47,7 +43,6 @@
 /**
  * The SLPV1SAttrMsg class models the SLP server side attribute message.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SDAAdvert.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SDAAdvert.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SLPV1SDAAdvert.java: SLPv1 DAAdvert, server side.
 //  Author:           James Kempf
 //  Created On:       Thu Sep 10 11:00:26 1998
@@ -46,7 +42,6 @@
 /**
  * The SLPV1SDAAdvert class models the SLPv1 DAAdvert message.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvDereg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvDereg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)SLPV1SSrvDereg.java	2.9	02/10/98
 //  SLPV1SSrvDereg.java:    Message class for SLP service deregistration
 //			    request.
 //  Author:           James Kempf
@@ -47,7 +43,6 @@
  * The SLPV1SSrvDereg class models the server side SLP service
  * deregistration.
  *
- * @version 1.4 97/11/20
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SLPV1SSrvMsg.java: SLPv1 server side service rqst/reply.
 //  Author:           James Kempf
 //  Created On:       Thu Sep 10 15:33:58 1998
@@ -46,7 +42,6 @@
 /**
  * The SLPV1SSrvMsg class models the SLP server side service request message.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvReg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvReg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)SLPV1SSrvReg.java	2.11	03/18/98
 //  SLPV1SSrvReg.java:      Message class for SLP service registration request.
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 14:47:48 1997
@@ -45,7 +41,6 @@
 /**
  * The SLPV1SSrvReg class models the server side SLPv1 service registration.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvTypeMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SLPV1SSrvTypeMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SLPV1SSrvTypeMsg.java: SLPV1 Compatibility SrvType message
 //  Author:           James Kempf
 //  Created On:       Mon Sep 14 10:49:05 1998
@@ -46,7 +42,6 @@
 /**
  * The SLPV1SSrvTypeMsg class models the SLPv1 service type request message.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SSAAdvert.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SSAAdvert.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SSAAdvert.java:   Server Side SAAdvert Message.
 //  Author:           James Kempf
 //  Created On:       Tue Feb 10 15:00:39 1998
@@ -45,7 +41,6 @@
 /**
  * The SSAAdvert class models the SLP SAAdvert message.
  *
- * @version 1.4 97/11/20
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SSrvDereg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SSrvDereg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:       %W%	%G%
 //  SSrvDereg.java:    Message class for SLP service deregistration request.
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 15:00:38 1997
@@ -47,7 +43,6 @@
  * default class does SLPv2 deregs, but subclasses can do other versions
  * by redefining the initialize() and makeReply() messages.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SSrvMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SSrvMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SSrvMsg.java:     Message class for SLP service request.
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 13:40:16 1997
@@ -47,7 +43,6 @@
  * server side. Subclasses for other versions can specialize the
  * initialize() and makeReply() methods.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SSrvReg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SSrvReg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999, 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SSrvReg.java:      Message class for SLP service registration request.
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 14:47:48 1997
@@ -47,7 +43,6 @@
  * default class does SLPv2 regs, but subclasses can do other versions
  * by redefining the initialize() and makeReply() messages.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SSrvTypeMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SSrvTypeMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SSrvTypeMsg.java: Message class for SLP service type request
 //  Author:           James Kempf
 //  Created On:       Thu Oct  9 14:29:22 1997
@@ -45,7 +41,6 @@
 /**
  * The SSrvTypeMsg class models the SLP service type request message.
  *
- * @version %M%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServerAttribute.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServerAttribute.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServerAttribute.java: Attribute created on the server side only.
 //  Author:           James Kempf
 //  Created On:       Thu Apr 23 08:53:49 1998
@@ -49,7 +45,6 @@
  * an AttributeString object for the id is included, for pattern
  * matching against the id.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServerDATable.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServerDATable.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServerDATable.java: Abstract class for DA Table in the DA/SA server.
 //  Author:           James Kempf
 //  Created On:       Wed May 20 08:30:46 1998
@@ -59,7 +55,6 @@
  * The ServerDATable also does active discovery for the SA server/DA,
  * in a separate thread.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttribute.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttribute.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001,2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
-//  %M% : Class for attributes in SLP.
+//  ServiceLocationAttribute.java : Class for attributes in SLP.
 //  Author:           James Kempf, Erik Guttman
 //
 
@@ -40,7 +36,6 @@
 /**
  * The ServiceLocationAttribute class models SLP attributes.
  *
- * @version %R%.%L% %D%
  * @author James Kempf, Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeDescriptor.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeDescriptor.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceLocationAttributeDescriptor.java: Describes an SLP attribute.
 //  Author:           James Kempf
 //  Created On:       Thu Jun 19 10:38:01 1997
@@ -47,7 +43,6 @@
  * verification should be done through the
  * <b>ServiceLocationAttributeVerifier</b>.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  *
  */
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeV1.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeV1.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceLocationAttributeV1.java: SLPv1 character encoding and decoding
 //  Author:           James Kempf
 //  Created On:       Fri Oct  9 19:18:17 1998
@@ -43,7 +39,6 @@
 /**
  * Handles attribute string encoding and decoding for SLPv1.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
@@ -60,7 +55,6 @@
     /**
      * Handles radix64 string encoding and decoding for SLPv1.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeVerifier.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationAttributeVerifier.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceLocationAttributeVerifier.java: Attribute parser for SLP templates.
 //  Author:           James Kempf
 //  Created On:       Thu Jun 19 10:20:25 1997
@@ -48,7 +44,6 @@
  * service type. Clients obtain <b>ServiceLocationAttributeVerifier</b>
  * objects for specific SLP service types through the <b>TemplateRegistry</b>.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  *
  */
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationEnumeration.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationEnumeration.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceLocationEnumeration.java:
 //  Author:           James Kempf
 //  Created On:       Wed May 13 17:38:01 1998
@@ -44,7 +40,6 @@
  * The ServiceLocationEnumeration interface extends Enumeration
  * with a method that can throw an exception.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationEnumerator.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationEnumerator.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceLocationEnumerator.java: Class implementing SLP enumerator.
 //  Author:           James Kempf
 //  Created On:       Thu May 21 14:36:55 1998
@@ -46,7 +42,6 @@
  * method that can (but not in this implementation) throw a
  * ServiceLocationException.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationException.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationException.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
-//  %M : All SLP exceptions are derived from this base class.
+//  ServiceLocationException.java : All SLP exceptions are derived from
+//                                  this base class.
 //  Author:           Erik Guttman
 //
 
@@ -42,7 +39,6 @@
  * during SLP operation. The exact nature of the error is indicated
  * by the integer error codes.
  *
- * @version %R%.%L% %D%
  * @author  Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationManager.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceLocationManager.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)ServiceLocationManager.java	1.18	07/23/97
-//  %M : The service locator object.
+//  ServiceLocationManager.java : The service locator object.
 //  Author:           Erik Guttman
 //
 
@@ -45,7 +41,6 @@
  * Location facility. In addition, it provides access to known
  * scopes.
  *
- * @version %R%.%L% %D%
  * @author Erik Guttman
  *
  */
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceStore.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceStore.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceStore.java: Interface for different storage implementations
 //  Author:           James Kempf
 //  Created On:       Thu Oct 16 07:46:45 1997
@@ -49,7 +45,6 @@
  * Each ServiceStore implementation must also supply ServiceRecord
  * objects.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
@@ -88,7 +83,6 @@
      * stored in the ServiceStore. The methods are all property
      * accessors.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceStoreFactory.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceStoreFactory.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceStoreFactory.java: Factory for creating ServiceStore objects.
 //  Author:           James Kempf
 //  Created On:       Fri Apr 17 12:14:12 1998
@@ -48,7 +44,6 @@
  * a connection to an LDAP server, or a persistent object
  * database.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceStoreInMemory.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceStoreInMemory.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001,2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceStoreInMemory.java: An in-memory implementation
 //			       of the service store.
 //  Author:           James Kempf
@@ -47,7 +43,6 @@
  * on in-memory data structures.
  * <details of those structures here>
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
@@ -57,7 +52,6 @@
      * The BVCollector interface allows various
      * data structures to collect stuff from the BtreeVector.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -73,7 +67,6 @@
      * The ParserBVCollector class implements a BtreeVector
      * collector for the parser.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -128,7 +121,6 @@
      * The AttributeBVCollector class implements a BtreeVector
      * collector for the collecting attribute values by type.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -170,7 +162,6 @@
      * The ScopeBVCollector class implements a BtreeVector
      * collector for the collecting records if scopes match.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -221,7 +212,6 @@
      * The AllBVCollector class implements a BtreeVector
      * collector for collecting all records.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -249,7 +239,6 @@
      * The List class implements a linked list for storing records
      * in the BtreeVector structure.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -308,7 +297,6 @@
      * The RegRecord class implements a record with the value for the
      * record buckets. It is used as elements in BtreeVector.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -361,7 +349,6 @@
      * The BtreeVector class stores registrations in sorted order. The
      * Quicksort algorithm is used to insert items and search for something.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -922,7 +909,6 @@
     /**
      * The InMemoryEvaluator evaluates queries for ServiceStoreInMemory.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -1100,7 +1086,6 @@
      * ServiceStore.ServiceRecord interface on in-memory data structures.
      * Each property is implemented as an instance variable.
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
@@ -1282,7 +1267,6 @@
     /**
      * A record for scopeTypeLangTable table,
      *
-     * @version %R%.%L% %D%
      * @author James Kempf
      */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceTable.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceTable.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)ServiceTable.java	2.7	11/20/97
 //  ServiceTable.java: Storage of all services.
 //  Author:           James Kempf
 //  Created On:       Fri Oct 10 14:23:25 1997
@@ -48,7 +44,6 @@
  * that any exceptions internal to the service table are processed
  * and either returned as SrvRply objects or are reported.
  *
- * @version 2.7 97/11/20
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceType.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceType.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceType.java: Model a service type.
 //  Author:           James Kempf
 //  Created On:       Thu Apr  9 09:23:18 1998
@@ -47,7 +43,6 @@
  * service type name is a simple URL scheme identifier, a service:
  * type, an abstract type or protocol type.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceURL.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceURL.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      @(#)ServiceURL.java	1.11	06/17/97
-//  *M% :  The service URL.
+//  ServiceURL.java :  The service URL.
 //  Author:           James Kempf, Erik Guttman
 //
 
@@ -42,7 +38,6 @@
  * The ServiceURL object models the SLP service URL. Both service: URLs
  * and regular URLs are handled by this class.
  *
- * @version 1.3 98/10/14
  * @author James Kempf, Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/ServiceURLV1.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/ServiceURLV1.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  ServiceURLV1.java: SLPv1 Service URL class.
 //  Author:           James Kempf
 //  Created On:       Fri Oct  9 19:08:53 1998
@@ -45,7 +41,6 @@
  * ServiceURLV1 enforces no abstract types and no non-service: URL types for
  * SLPv1 queries.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SrvLocHeader.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SrvLocHeader.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SrvLocHeader.java: Abstract superclass for SLP Headers
 //  Author:           James Kempf
 //  Created On:       Mon Sep 14 12:47:20 1998
@@ -51,7 +47,6 @@
  * subclasses. We also let the SrvLocHeader serve as a SrvLocMsg object
  * to handle the SrvAck, which only has an error code.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SrvLocMsg.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SrvLocMsg.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SrvLocMsg.java:   Abstract class for all SLP message objects.
 //  Author:           James Kempf
 //  Created On:       Mon Sep 14 13:03:22 1998
@@ -46,7 +42,6 @@
  * SrvLocMsg is an interface supported by all SLP message objects,
  * regardless of type.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SrvLocMsgImpl.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SrvLocMsgImpl.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SrvLocMsgImpl.java:  SrvLocMsg implementation.
 //  Author:           James Kempf
 //  Created On:       Tue Sep 15 10:06:27 1998
@@ -44,7 +40,6 @@
  * The SrvLocMsgImpl class is the base class for all SLPv2 side SrvLocMsg
  * implementations.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/StreamListener.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/StreamListener.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  StreamListener.java: Listen to stream socket, spawn request to
 //			  handle incoming request.
 //  Author:           James Kempf
@@ -47,7 +43,6 @@
  * Listen on the SLP port for clients requesting a stream connection. Spawn
  * a request handler to handle the connection.
  *
- * @version %R%.%L% %D%
  * @author James Kempf, Erik Guttman
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SunDATable.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SunDATable.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2001,2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SunDATable.java: A DATable implementation that uses the IPC connection.
 //  Author:           James Kempf
 //  Created On:       Mon May 11 15:00:23 1998
@@ -63,7 +59,6 @@
  * time stamp runs out. The time stamp is determined as the minimum
  * expiration time of the service URLs.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/SunServerDATable.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/SunServerDATable.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 2001 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  SunServerDATable.java: Server DA Table for Sun's client/SA server SLP.
 //  Author:           James Kempf
 //  Created On:       Wed May 20 09:58:46 1998
@@ -59,7 +55,6 @@
  * initialized to be the local machine name, but it may also include other
  * names.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/TemplateRegistry.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/TemplateRegistry.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  TemplateRegistry.java:
 //  Author:           James Kempf
 //  Created On:       Fri Jul  4 11:38:39 1997
@@ -47,7 +43,6 @@
  * template attributes.
  *
  * @author James Kempf
- * @version %R%.%L% %D%
  *
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/UARequester.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/UARequester.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  UARequester.java: Requester operations for UA.
 //  Author:           James Kempf
 //  Created On:       Thu Jan  8 15:17:35 1998
@@ -48,7 +44,6 @@
  * If no DA is present, and convergence is used to gather
  * results, these will be merged into one result.
  *
- * @version %R%.%L% %D%
  * @author Erik Guttman, James Kempf
  */
 
--- a/usr/src/lib/libslp/javalib/com/sun/slp/URLAttributeVerifier.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/URLAttributeVerifier.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright (c) 1999 by Sun Microsystems, Inc.
  * All rights reserved.
  *
  */
 
-//  SCCS Status:      %W%	%G%
 //  URLAttributeVerifier.java: Parse a service template from a URL
 //  Author:           James Kempf
 //  Created On:       Mon Jun 23 11:52:04 1997
@@ -47,7 +43,6 @@
  * a URL. Most of the work is done by the superclass. This class
  * takes care of opening the Reader on the URL.
  *
- * @version %R%.%L% %D%
  * @author James Kempf
  *
  */
--- a/usr/src/lib/libslp/javalib/com/sun/slp/slpd.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libslp/javalib/com/sun/slp/slpd.java	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- *
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 
-//  SCCS Status:      %W%       %G%
-//  %M : The service location daemon.
+//  sldp.java : The service location daemon.
 //  Author:           Erik Guttman
 //
 
@@ -85,7 +81,6 @@
  * configuration file syntax and <a href="slpd.reg.html">slpd.reg</a>
  * for more information on proxy registration file syntax.
  *
- * @version 1.20 99/01/14
  * @author Erik Guttman, James Kempf
  */
 
--- a/usr/src/lib/libtnfctl/i386_assm.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libtnfctl/i386_assm.s	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -37,8 +36,7 @@
  * }
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-	.file	"%M%"
+	.file	"i386_assm.s"
 	.data
 	.align	4
 	.globl	prb_callinfo
--- a/usr/src/lib/libtnfctl/sparc_assm.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/lib/libtnfctl/sparc_assm.s	Wed Aug 06 16:29:39 2008 -0600
@@ -1,5 +1,3 @@
-!
-!	ident	"%Z%%M%	%I%	%E% SMI"
 !
 !	 Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 !	 Use is subject to license terms.
@@ -24,9 +22,8 @@
 !
 !	 CDDL HEADER END
 !
-!
-	.ident		"%Z%%M%	%I%	%E% SMI"
-	.file		"%M%"
+
+	.file		"sparc_assm.s"
 	.section	".data"
 	.align		4
 	.global		prb_callinfo
--- a/usr/src/pkgdefs/SUNWmibii/pkginfo.tmpl	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/pkgdefs/SUNWmibii/pkginfo.tmpl	Wed Aug 06 16:29:39 2008 -0600
@@ -20,11 +20,9 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # This required package information file describes characteristics of the
@@ -44,7 +42,6 @@
 MAXINST="1000"
 SUNW_PRODNAME="SunOS"
 SUNW_PRODVERS="RELEASE/VERSION"
-PSTAMP="Solstice Enterprise Agents 1.0.3 SNMP daemon - %H%"
 SUNW_PKGTYPE="usr"
 EMAIL=""
 HOTLINE="Please contact your local service provider"
--- a/usr/src/pkgdefs/SUNWsacom/pkginfo.tmpl	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/pkgdefs/SUNWsacom/pkginfo.tmpl	Wed Aug 06 16:29:39 2008 -0600
@@ -20,11 +20,9 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # This required package information file describes characteristics of the
@@ -44,7 +42,6 @@
 SUNW_PRODVERS="RELEASE/VERSION"
 VENDOR="Sun Microsystems, Inc."
 VERSION="ONVERS,REV=0.0.0"
-PSTAMP="Solstice Enterprise Agents 1.0.3 files - %H%"
 SUNW_PKGTYPE="root"
 EMAIL=""
 HOTLINE="Please contact your local service provider"
--- a/usr/src/pkgdefs/SUNWsasnm/pkginfo.tmpl	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/pkgdefs/SUNWsasnm/pkginfo.tmpl	Wed Aug 06 16:29:39 2008 -0600
@@ -20,11 +20,9 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # This required package information file describes characteristics of the
@@ -44,7 +42,6 @@
 SUNW_PRODVERS="RELEASE/VERSION"
 VENDOR="Sun Microsystems, Inc."
 VERSION="ONVERS,REV=0.0.0"
-PSTAMP="Solstice Enterprise Agents 1.0.3 Simple Network Management Protocol - %H%"
 SUNW_PKGTYPE="usr"
 EMAIL=""
 HOTLINE="Please contact your local service provider"
--- a/usr/src/prototypes/prototype.Makefile	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.Makefile	Wed Aug 06 16:29:39 2008 -0600
@@ -23,5 +23,4 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+
--- a/usr/src/prototypes/prototype.c	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.c	Wed Aug 06 16:29:39 2008 -0600
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Block comment that describes the contents of this file.
  */
--- a/usr/src/prototypes/prototype.csh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.csh	Wed Aug 06 16:29:39 2008 -0600
@@ -24,5 +24,4 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+
--- a/usr/src/prototypes/prototype.h	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.h	Wed Aug 06 16:29:39 2008 -0600
@@ -27,8 +27,6 @@
 #ifndef _HEADER_H
 #define	_HEADER_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Block comment that describes the contents of this file.
  */
--- a/usr/src/prototypes/prototype.java	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.java	Wed Aug 06 16:29:39 2008 -0600
@@ -25,9 +25,5 @@
  */
 
 /*
- * ident	"%Z%%M%	%I%	%E% SMI"
- */
-
-/*
  * Comment that describes the contents of this file.
  */
--- a/usr/src/prototypes/prototype.ksh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.ksh	Wed Aug 06 16:29:39 2008 -0600
@@ -24,5 +24,4 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+
--- a/usr/src/prototypes/prototype.man	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.man	Wed Aug 06 16:29:39 2008 -0600
@@ -20,4 +20,4 @@
 .\" Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 .\" Use is subject to license terms.
 .\"
-.\" ident	"%Z%%M%	%I%	%E% SMI"
+
--- a/usr/src/prototypes/prototype.pl	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.pl	Wed Aug 06 16:29:39 2008 -0600
@@ -24,8 +24,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Block comment that describes the contents of this file.
--- a/usr/src/prototypes/prototype.py	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.py	Wed Aug 06 16:29:39 2008 -0600
@@ -24,8 +24,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Block comment that describes the contents of this file.
--- a/usr/src/prototypes/prototype.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-	.ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"prototype.s"
 
 /*
  * Block comment that describes the contents of this file.
--- a/usr/src/prototypes/prototype.sh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/prototypes/prototype.sh	Wed Aug 06 16:29:39 2008 -0600
@@ -24,5 +24,3 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
--- a/usr/src/tools/abi/audit/abi_audit.c	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/abi/audit/abi_audit.c	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "abi_audit.h"
 #include <time.h>
 
@@ -78,7 +75,7 @@
 static scenario_t	sequence_match(liblist_t *, int);
 static sequence_t	*generate_sequence(sequence_t *, bvlist_t *,
 			liblist_t *);
-static void		add_sccs_keyword_and_release(FILE *);
+static void		add_copyright_and_release(FILE *);
 static void		cleanup(void);
 static void		decode_filename(char *);
 static void		detect_errors(symbol_t *, FILE *);
@@ -141,7 +138,7 @@
 		}
 	} else {
 		/* print symbol info to file */
-		add_sccs_keyword_and_release(Db);
+		add_copyright_and_release(Db);
 		tree_traverse(Sym_List);
 	}
 
@@ -205,7 +202,7 @@
 				if ((Db = fopen(optarg, "w")) == NULL) {
 					(void) fprintf(stderr,
 					"%s: fopen failed to open <%s>: %s\n",
-					program, optarg, strerror(errno));
+					    program, optarg, strerror(errno));
 					return (FAIL);
 				}
 				gflag ++;
@@ -748,8 +745,8 @@
 	/* look for release string file */
 	if ((dirp = opendir(intf_check_dir)) == NULL) {
 		(void) fprintf(stderr,
-			"%s: %s: %s: No such directory. Please try again.\n",
-			program, path, strerror(errno));
+		    "%s: %s: %s: No such directory. Please try again.\n",
+		    program, path, strerror(errno));
 		return (FAIL);
 	}
 
@@ -770,9 +767,8 @@
 			if (strlcpy(release, dp->d_name, MAXPATHLEN)
 			    >= MAXPATHLEN) {
 				(void) fprintf(stderr,
-					"%s: proc_intf_check_dir: "
-					"strlcpy: %s\n",
-					program, strerror(errno));
+				    "%s: proc_intf_check_dir: strlcpy: %s\n",
+				    program, strerror(errno));
 				errmsg = FAIL;
 				break;
 			}
@@ -1660,7 +1656,7 @@
 			    (scenario == SCENARIO_18)) &&
 			    (p->st_lib->lt_libc_migrate == FALSE) && Tflag) {
 				if (!sflag)
-				    report_err_msg("WARNING", p, fp);
+					report_err_msg("WARNING", p, fp);
 			} else if (pflag && (scenario == SCENARIO_01)) {
 				if (!sflag)
 					report_err_msg("WARNING", p, fp);
@@ -1770,12 +1766,11 @@
 }
 
 /*
- * Adds SCCS keyword, Copyright and customer releases captured
- * in ABI database file
+ * Adds Copyright and customer releases captured in ABI database file
  */
 
 static void
-add_sccs_keyword_and_release(FILE *fp)
+add_copyright_and_release(FILE *fp)
 {
 	int		i;
 	time_t		t;
@@ -1789,12 +1784,6 @@
 	    "  All rights reserved.\n"
 	    "# Use is subject to license terms.\n"
 	    "#\n"
-	    "#ident\t\"%%"
-	    "Z%%%%"
-	    "M%%\t%%"
-	    "I%%\t%%"
-	    "E%% SMI\"\n"
-	    "#\n"
 	    "#Releases:", 1900 + gmt->tm_year);
 
 	for (i = 0; i < Total_relcnt - 1; i ++) {
@@ -1822,8 +1811,8 @@
 	char	*sym_ver;
 
 	if ((find_exported_release(p->st_lib, 0) != FAIL) &&
-		((bv_all_zero(p->st_lib->lt_cat->ct_public) != TRUE) ||
-		(bv_all_zero(p->st_lib->lt_cat->ct_private) != TRUE))) {
+	    ((bv_all_zero(p->st_lib->lt_cat->ct_public) != TRUE) ||
+	    (bv_all_zero(p->st_lib->lt_cat->ct_private) != TRUE))) {
 		(void) fprintf(db, "%s %s %d %d ", p->st_sym_name,
 		    p->st_lib->lt_lib_name, p->st_type, p->st_size);
 
--- a/usr/src/tools/codereview/codereview.1	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/codereview/codereview.1	Wed Aug 06 16:29:39 2008 -0600
@@ -1,11 +1,8 @@
-.\" ident	"%Z%%M%	%I%	%E% SMI"
-.\"
 .\" CDDL HEADER START
 .\"
 .\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License, Version 1.0 only
-.\" (the "License").  You may not use this file except in compliance
-.\" with the License.
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
 .\"
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 .\" or http://www.opensolaris.org/os/licensing.
@@ -20,16 +17,9 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" "Copyright 2000 Sun Microsystems, Inc."
-.\" "All rights reserved"
-.\" "Use is subject to license terms."
-.de)I
-.nr;9 0\\$1+1
-.ds)i \\$\\n(;9
-.rr;9
-..
-.)I 2 $Date: %E% $
-.TH CODEREVIEW 1-LOCAL "\\*()i"
+.\" Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+.\" Use is subject to license terms.
+.TH codereview 1 "August 5, 2008"
 .UC
 .SH NAME
 codereview \- Diff list generator
--- a/usr/src/tools/codereview/lwlp.c	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/codereview/lwlp.c	Wed Aug 06 16:29:39 2008 -0600
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-static char sccsid[] = "%Z%%M%	%I%	%E% SMI";
-
 /*
  * lwlp - Convert ASCII text to PostScript
  *
@@ -294,7 +289,7 @@
 
 	/*LINTED*/
 	if (iscodereview = strncmp(progname, CODEREVIEW,
-			sizeof (CODEREVIEW) - 1) == 0) {
+	    sizeof (CODEREVIEW) - 1) == 0) {
 		layoutp = &layout2;
 		numberwidth = 4;
 		columns = 85;		/* extra space for numbering */
@@ -302,7 +297,7 @@
 	}
 
 	while ((ch = getopt(argc, argv,
-			"1248B:c:deG:h:I:l:Ln:P:prt:vw:X:y:")) != -1) {
+	    "1248B:c:deG:h:I:l:Ln:P:prt:vw:X:y:")) != -1) {
 		switch (ch) {
 		case '1':
 			layoutp = &layout1;
@@ -418,12 +413,12 @@
 			break;
 		default:
 			(void) fprintf(stderr,
-					"usage: %s %s\n\t%s\n\t%s\n\t%s\n",
-					iscodereview ? LWLP : progname,
-					USAGE1, USAGE2, USAGE3, USAGE4);
+			    "usage: %s %s\n\t%s\n\t%s\n\t%s\n",
+			    iscodereview ? LWLP : progname,
+			    USAGE1, USAGE2, USAGE3, USAGE4);
 			if (iscodereview)
 				(void) fprintf(stderr, "\t%s [%s flags] %s\n",
-						CODEREVIEW, LWLP, USAGE6);
+				    CODEREVIEW, LWLP, USAGE6);
 			exit(1);
 		}
 	}
@@ -468,14 +463,14 @@
 		end_x = DEFAULT_PAGE_WIDTH * POINTS_PER_INCH;
 		if (wflag) {
 			point_size = DEFAULT_PAGE_WIDTH * POINTS_PER_INCH /
-					((columns + 0.5) * DEFAULT_CHAR_WIDTH);
+			    ((columns + 0.5) * DEFAULT_CHAR_WIDTH);
 			lines_per_page = DEFAULT_PAGE_HEIGHT * POINTS_PER_INCH /
-					point_size;
+			    point_size;
 		} else {
 			point_size = DEFAULT_PAGE_HEIGHT * POINTS_PER_INCH /
-					(lines_per_page + 0.5);
+			    (lines_per_page + 0.5);
 			columns = DEFAULT_PAGE_WIDTH * POINTS_PER_INCH /
-					(point_size * DEFAULT_CHAR_WIDTH);
+			    (point_size * DEFAULT_CHAR_WIDTH);
 		}
 	} else {
 		rot_text = 90 - layoutp->rotation;
@@ -484,28 +479,28 @@
 		end_x = DEFAULT_PAGE_HEIGHT * POINTS_PER_INCH;
 		if (wflag) {
 			point_size = DEFAULT_PAGE_HEIGHT * POINTS_PER_INCH /
-					((columns + 0.5) * DEFAULT_CHAR_WIDTH);
+			    ((columns + 0.5) * DEFAULT_CHAR_WIDTH);
 			lines_per_page = DEFAULT_PAGE_WIDTH * POINTS_PER_INCH /
-					point_size;
+			    point_size;
 		} else {
 			point_size = DEFAULT_PAGE_WIDTH * POINTS_PER_INCH /
-					(lines_per_page + 0.5);
+			    (lines_per_page + 0.5);
 			columns = DEFAULT_PAGE_HEIGHT * POINTS_PER_INCH /
-					(point_size * DEFAULT_CHAR_WIDTH);
+			    (point_size * DEFAULT_CHAR_WIDTH);
 		}
 	}
 
 	box_height = DEFAULT_PAGE_HEIGHT * POINTS_PER_INCH / layoutp->page_rows;
 	if (layoutp->rotation == 0)
 		box_width = box_height /
-				DEFAULT_PAGE_HEIGHT * DEFAULT_PAGE_WIDTH;
+		    DEFAULT_PAGE_HEIGHT * DEFAULT_PAGE_WIDTH;
 	else
 		box_width = box_height *
-				DEFAULT_PAGE_HEIGHT / DEFAULT_PAGE_WIDTH;
+		    DEFAULT_PAGE_HEIGHT / DEFAULT_PAGE_WIDTH;
 	gap_width = DEFAULT_PAPER_WIDTH * POINTS_PER_INCH /
-			layoutp->page_cols - box_width;
+	    layoutp->page_cols - box_width;
 	gap_height = DEFAULT_PAPER_HEIGHT * POINTS_PER_INCH /
-			layoutp->page_rows - box_height;
+	    layoutp->page_rows - box_height;
 	margin_x = gap_width/2;
 	margin_y = gap_height/2;
 
@@ -534,27 +529,26 @@
 		}
 
 		positions[j].base_x = margin_x +
-				phys_col * (box_width + gap_width);
+		    phys_col * (box_width + gap_width);
 		positions[j].base_y = margin_y +
-				phys_row * (box_height + gap_height);
+		    phys_row * (box_height + gap_height);
 		if (rot_text != 0) {
 			positions[j].base_x += box_width;
 		}
 	}
 
 	if (vflag) {
-		(void) fprintf(stderr, "%s: %s\n\n", progname, sccsid);
+		(void) fprintf(stderr, "%s:\n\n", progname);
 		(void) fprintf(stderr, "Lines/page = %d\n", lines_per_page);
 		(void) fprintf(stderr, "Columns = %d\n", columns);
 		for (j = 0; j < layoutp->pages; j++) {
 			(void) fprintf(stderr, "\tx=%3d, y=%3d\n",
-					positions[j].base_x,
-					positions[j].base_y);
+			    positions[j].base_x, positions[j].base_y);
 		}
 		(void) fprintf(stderr, "box_width=%3d, box_height=%3d\n",
-				box_width, box_height);
+		    box_width, box_height);
 		(void) fprintf(stderr, "gap_width=%3d, gap_height=%3d\n",
-				gap_width, gap_height);
+		    gap_width, gap_height);
 	}
 
 	setup();
@@ -564,13 +558,13 @@
 		char	command[BUFSIZ];
 
 		(void) snprintf(command, BUFSIZ, "diff -b -D %s %s %s",
-			CODEREVIEW, argv[first_file+1], argv[first_file]);
+		    CODEREVIEW, argv[first_file+1], argv[first_file]);
 		infile = popen(command, "r");
 		bannerfile = argv[first_file+1];
 		if (ungetc(getc(infile), infile) == EOF) {
 			(void) pclose(infile);
 			(void) sprintf(command,
-					"echo No differences encountered");
+			    "echo No differences encountered");
 			infile = popen(command, "r");
 		}
 		setheaderfile(bannerfile);
@@ -596,7 +590,7 @@
 			}
 			if (vflag)
 				(void) fprintf(stderr, "\tprinting %s\n",
-						argv[i]);
+				    argv[i]);
 			setheaderfile(argv[i]);
 			printfile(infile);
 			if (pflag)
@@ -630,8 +624,8 @@
 	(void) printf("%%%%CreationDate: %s\n", currentdate);
 	(void) printf("%%%%For: %s\n", username);
 	(void) printf("%%%%DocumentFonts: %s %s %s %s\n",
-		default_font, default_font_bold,
-		default_font_italic, default_font_bold_italic);
+	    default_font, default_font_bold,
+	    default_font_italic, default_font_bold_italic);
 	(void) printf("%%%%Pages: (atend)\n");
 
 	if (prologue == NULL) {
@@ -655,13 +649,13 @@
 	}
 
 	(void) printf("/%s {%f /%s %s}bind def\n", DEFAULT_FONT,
-			point_size, default_font, SELECT_FONT);
+	    point_size, default_font, SELECT_FONT);
 	(void) printf("/%s {%f /%s %s}bind def\n", DEFAULT_FONT_BOLD,
-			point_size, default_font_bold, SELECT_FONT);
+	    point_size, default_font_bold, SELECT_FONT);
 	(void) printf("/%s {%f /%s %s}bind def\n", DEFAULT_FONT_ITALIC,
-			point_size, default_font_italic, SELECT_FONT);
+	    point_size, default_font_italic, SELECT_FONT);
 	(void) printf("/%s {%f /%s %s}bind def\n", DEFAULT_FONT_BOLD_ITALIC,
-			point_size, default_font_bold_italic, SELECT_FONT);
+	    point_size, default_font_bold_italic, SELECT_FONT);
 }
 
 void
@@ -868,12 +862,9 @@
 			numberwidth = 0;
 			current.lineno++;
 			current.row -= point_size;
-			setcurrentfont(DEFAULT_FONT_BOLD_ITALIC,
-				outfile);
-			proc("______unchanged_portion_omitted_",
-				outfile);
-			restore_format_state(&format_state,
-				outfile);
+			setcurrentfont(DEFAULT_FONT_BOLD_ITALIC, outfile);
+			proc("______unchanged_portion_omitted_", outfile);
+			restore_format_state(&format_state, outfile);
 			savestate(outfile);
 			dots_inserted = 1;
 		}
@@ -942,10 +933,10 @@
 				altlinenumber = tmplinenumber;
 				if (!old_stuff)
 					setcurrentfont(DEFAULT_FONT_BOLD,
-							outfile);
+					    outfile);
 				else
 					setcurrentfont(DEFAULT_FONT_ITALIC,
-							outfile);
+					    outfile);
 			} else /* if (strcmp(command, "endif") == 0) */ {
 				in_change = 0;
 				makegray = 0;
@@ -990,10 +981,8 @@
 		setcurrentfont((char *)NULL, outfile);
 	(void) fprintf(outfile, "%s ", SET_WIDTHS);
 	(void) fprintf(outfile, "%d %f %d %d %s\n",
-			rot_text, layoutp->scale,
-			positions[logical_page].base_x,
-			positions[logical_page].base_y,
-			START_PAGE);
+	    rot_text, layoutp->scale, positions[logical_page].base_x,
+	    positions[logical_page].base_y, START_PAGE);
 	lines = 0;
 	if (header) {
 		save_format_state(&format_state);
@@ -1003,14 +992,14 @@
 
 		current.row -= point_size;
 		(void) fprintf(outfile, "%d %.2f %s\n", start_x, current.row,
-				MOVETO);
+		    MOVETO);
 		proc(headerstring, outfile);
 		(void) snprintf(buf, 8, "%d", current.logical_page_count + 1);
 		buflen = strlen(buf);
 		(void) fprintf(outfile, "%d %.2f %s (%s)%s\n",
-				(int)(end_x - (buflen + 0.5) *
-				    DEFAULT_CHAR_WIDTH * point_size),
-				current.row, MOVETO, buf, SHOW);
+		    (int)(end_x - (buflen + 0.5) *
+		    DEFAULT_CHAR_WIDTH * point_size),
+		    current.row, MOVETO, buf, SHOW);
 		current.row -= point_size;
 		restore_format_state(&format_state, outfile);
 		lines = 2;
@@ -1039,8 +1028,8 @@
 	if (layoutp->pages == 1)
 		return;
 
-	(void) fprintf(outfile, "%f %s %s\n",
-			RULE_WIDTH, SETLINEWIDTH, NEWPATH);
+	(void) fprintf(outfile, "%f %s %s\n", RULE_WIDTH, SETLINEWIDTH,
+	    NEWPATH);
 	begin = 0; end = DEFAULT_PAPER_WIDTH * POINTS_PER_INCH;
 	for (i = 1, ilimit = layoutp->page_rows; i < ilimit; i++) {
 		place = margin_y - gap_height/2 + i * (box_height+gap_height);
@@ -1101,8 +1090,7 @@
 
 	if (vflag)
 		(void) fprintf(stderr, "\nreversing %d page%s\n",
-				current.page_count,
-				current.page_count > 1 ? "s" : "");
+		    current.page_count, current.page_count > 1 ? "s" : "");
 	for (i = current.page_count - 1; i >= 0; i--) {
 		copypage(outfile, page_map[i], page_map[i+1]);
 	}
@@ -1178,15 +1166,15 @@
 			grayed++;
 			in += graylength;
 		} else if (boldlength &&
-				strncmp(in, boldstring, boldlength) == 0) {
+		    strncmp(in, boldstring, boldlength) == 0) {
 			altfont = DEFAULT_FONT_BOLD;
 			in += boldlength;
 		} else if (itlclength &&
-				strncmp(in, itlcstring, itlclength) == 0) {
+		    strncmp(in, itlcstring, itlclength) == 0) {
 			altfont = DEFAULT_FONT_ITALIC;
 			in += itlclength;
 		} else if (bitclength &&
-				strncmp(in, bitcstring, bitclength) == 0) {
+		    strncmp(in, bitcstring, bitclength) == 0) {
 			altfont = DEFAULT_FONT_BOLD_ITALIC;
 			in += bitclength;
 		} else
@@ -1194,11 +1182,12 @@
 	}
 	if (grayed) {
 		(void) fprintf(outfile, "%d %.2f %d %.2f %s\n",
-			start_x, current.row -
-				DEFAULT_DESCENDER_FRACTION * point_size,
-			end_x, current.row +
-				(1.0 - DEFAULT_DESCENDER_FRACTION) * point_size,
-			SHADE);
+		    start_x,
+		    current.row - DEFAULT_DESCENDER_FRACTION * point_size,
+		    end_x,
+		    current.row +
+			(1.0 - DEFAULT_DESCENDER_FRACTION) * point_size,
+		    SHADE);
 	}
 
 	linenumber++;
@@ -1209,18 +1198,18 @@
 
 	if (start_x != 0) {
 		(void) fprintf(outfile, "%d %.2f %s\n",
-				start_x, current.row, MOVETO);
+		    start_x, current.row, MOVETO);
 	}
 	else
 		(void) fprintf(outfile, "%.2f %s\n",
-				current.row, ZEROMOVETO);
+		    current.row, ZEROMOVETO);
 	if (numberwidth) {
 		setcurrentfont(DEFAULT_FONT, outfile);
 		(void) sprintf(bufout, "%*d", numberwidth, linenumber);
 		for (q = bufout, i = 0; *q == ' '; q++, i++)
 			;
 		(void) fprintf(outfile, "%d %s (%s)%s %d %s ",
-			i, TAB, q, SHOW, DEFAULT_SPACES_AFTER_NUMBER, TAB);
+		    i, TAB, q, SHOW, DEFAULT_SPACES_AFTER_NUMBER, TAB);
 	}
 	setcurrentfont(altfont, outfile);
 
@@ -1240,7 +1229,7 @@
 			}
 			if (currentp > 0) {	/* not beginning of line */
 				i = tabstop - (currentp % tabstop) +
-						tabc * tabstop;
+				    tabc * tabstop;
 				if (instr) {
 					(void) snprintf(q,
 					    BUFOUT - (q - bufout), ")%s ",
@@ -1271,7 +1260,7 @@
 			if (instr) {
 				*q = '\0';
 				(void) fprintf(outfile, "%s)%s\n",
-						bufout, SHOW);
+				    bufout, SHOW);
 			}
 			instr = 0;
 			if (currentp >= columns)
@@ -1294,17 +1283,17 @@
 			*q = '\0';
 			if (instr)
 				(void) fprintf(outfile, "%s)%s\n",
-						bufout, SHOW);
+				    bufout, SHOW);
 			else
 				(void) fprintf(outfile, "%s\n", bufout);
 			endpage(outfile);
 			(void) startpage(outfile);
 			current.row = start_y;
 			(void) fprintf(outfile, "%d %.2f %s\n",
-					start_x, current.row, MOVETO);
+			    start_x, current.row, MOVETO);
 			if (numberwidth)
 				(void) fprintf(outfile, "%d %s\n", numberwidth +
-					DEFAULT_SPACES_AFTER_NUMBER, TAB);
+				    DEFAULT_SPACES_AFTER_NUMBER, TAB);
 			q = bufout;
 			currentp = 0;
 			instr = 0;
@@ -1314,15 +1303,15 @@
 			if (instr) {
 				*q = '\0';
 				(void) fprintf(outfile, "%s)%s\n",
-						bufout, SHOW);
+				    bufout, SHOW);
 				instr = 0;
 				q = bufout;
 			}
 			(void) fprintf(outfile, "%d %.2f %s\n",
-					start_x, current.row, MOVETO);
+			    start_x, current.row, MOVETO);
 			if (numberwidth)
 				(void) fprintf(outfile, "%d %s\n", numberwidth +
-					DEFAULT_SPACES_AFTER_NUMBER, TAB);
+				    DEFAULT_SPACES_AFTER_NUMBER, TAB);
 			currentp = 0;
 			break;
 		case '\\':
--- a/usr/src/tools/cw/cw.c	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/cw/cw.c	Wed Aug 06 16:29:39 2008 -0600
@@ -20,19 +20,21 @@
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Wrapper for the GNU C compiler to make it accept the Sun C compiler
  * arguments where possible.
  *
  * Since the translation is inexact, this is something of a work-in-progress.
+ *
  */
 
+/* If you modify this file, you must increment CW_VERSION */
+#define	CW_VERSION	"1.25"
+
 /*
  * -#		Verbose mode
  * -###		Show compiler commands built by driver, no compilation
@@ -1863,7 +1865,7 @@
 	 *		ask each for its version if we know how.
 	 */
 	if (argc > 1 && strcmp(argv[1], "-_versions") == 0) {
-		(void) printf("%s", "cw version %I%");
+		(void) printf("cw version %s", CW_VERSION);
 		if (!do_shadow)
 			(void) printf(" (SHADOW MODE DISABLED)");
 		(void) printf("\n");
--- a/usr/src/tools/env/developer.sh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/env/developer.sh	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #	Configuration variables for the runtime environment of the nightly
 # build script and other tools for construction and packaging of releases.
@@ -52,12 +50,17 @@
 # PARENT_WS is used to determine the parent of this workspace. This is
 # for the options that deal with the parent workspace (such as where the
 # proto area will go).
+#
+# If you use this, it must be local (or nfs): nightly cannot copy
+# over ssh or http.
 PARENT_WS="/ws/onnv-gate";			export PARENT_WS
 
-# CLONE_WS is the workspace nightly should do a bringover from. Since it's
-# going to bringover usr/src, this could take a while, so we use the
-# clone instead of the gate (see the gate's README).
-CLONE_WS="/ws/onnv-clone";			export CLONE_WS
+# CLONE_WS is the workspace nightly should do a bringover from.
+CLONE_WS="ssh://onnv.sfbay.sun.com//export/onnv-clone";	export CLONE_WS
+
+# CLOSED_CLONE_WS is the workspace from which nightly should acquire
+# the usr/closed tree.
+CLOSED_CLONE_WS="${CLONE_WS}/usr/closed";	export CLOSED_CLONE_WS
 
 # This flag controls whether to build the closed source.  If
 # undefined, nightly(1) and bldenv(1) will set it according to whether
--- a/usr/src/tools/env/gatekeeper.sh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/env/gatekeeper.sh	Wed Aug 06 16:29:39 2008 -0600
@@ -23,8 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #	Configuration variables for the runtime environment of the nightly
 # build script and other tools for construction and packaging of releases.
@@ -61,12 +59,18 @@
 # PARENT_WS is used to determine the parent of this workspace. This is
 # for the options that deal with the parent workspace (such as where the
 # proto area will go).
+#
+# If you use this, it must be local (or nfs): nightly cannot copy
+# over ssh or http.
 PARENT_WS="/ws/$GATE";				export PARENT_WS
 
-# CLONE_WS is the workspace nightly should do a bringover from. Since it's
-# going to bringover usr/src, this could take a while, so we use the
-# clone instead of the gate (see the gate's README).
-CLONE_WS="/ws/onnv-clone";			export CLONE_WS
+# CLONE_WS is the workspace nightly should do a bringover from.
+CLONE_WS="ssh://onnv.sfbay.sun.com//export/onnv-clone";	export CLONE_WS
+
+# CLOSED_CLONE_WS is the workspace from which nightly will acquire the
+# usr/closed tree.
+CLOSED_CLONE_WS="${CLONE_WS}/usr/closed"
+export CLOSED_CLONE_WS
 
 # This flag controls whether to build the closed source.  If
 # undefined, nightly(1) and bldenv(1) will set it according to whether
--- a/usr/src/tools/env/opensolaris.sh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/env/opensolaris.sh	Wed Aug 06 16:29:39 2008 -0600
@@ -21,9 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#
+
 #	Configuration variables for the runtime environment of the nightly
 # build script and other tools for construction and packaging of releases.
 # This script is sourced by 'nightly' and 'bldenv' to set up the environment
@@ -80,10 +78,9 @@
 # proto area will go).
 PARENT_WS="";			export PARENT_WS
 
-# CLONE_WS is the workspace nightly should do a bringover from. Since it's
-# going to bringover usr/src, this could take a while, so we use the
-# clone instead of the gate (see the gate's README).
-CLONE_WS="";			export CLONE_WS
+# CLONE_WS is the workspace nightly should do a bringover from.
+CLONE_WS="ssh://anon@hg.opensolaris.org//hg/onnv/onnv-gate"
+export CLONE_WS
 
 # The bringover, if any, is done as STAFFER.
 # Set STAFFER to your own login as gatekeeper or developer
--- a/usr/src/tools/onbld/Checks/Rti.py	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/onbld/Checks/Rti.py	Wed Aug 06 16:29:39 2008 -0600
@@ -24,8 +24,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Check on RTI status for bug IDs passed.
@@ -63,17 +61,30 @@
 
 	# Check to see if we were given a gate to lookup with
 	if gatePath != None:
-		# strip any trailing /
-		gatePath.rstrip('/')
-		gateName = os.path.split(gatePath)[1]
+
+		#
+		# The gate name should be the last component of the gate path,
+		# no matter how it's accessed.
+		#
+		# We make a special case for "closed," and check to see if it
+		# appears to be the "usr/closed" portion of a nested repository.
+		# In that case, we really want the parent repository name.
+		#
+		gatePath = gatePath.rstrip(os.path.sep).split(os.path.sep)
+		gateName = gatePath[-1]
+		try:
+			if gatePath[-2:] == ['usr', 'closed']:
+				gateName = gatePath[-3]
+		except IndexError:
+			pass
 
 		# Is this a patch gate?
-		if patchGateRe.search(gatePath):
+		if patchGateRe.search(gateName):
 			rtiType = "Patch"
 			gateType = "Patch"
 
 		# Is this a test gate?
-		if testGateRe.search(gatePath):
+		if testGateRe.search(gateName):
 			rtiType = "RTI"
 			gateType = "RTI"
 	else:
--- a/usr/src/tools/onbld/Scm/Backup.py	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/onbld/Scm/Backup.py	Wed Aug 06 16:29:39 2008 -0600
@@ -17,8 +17,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 '''
 Workspace backup
@@ -362,7 +360,7 @@
     def __init__(self, backup, ws):
         self.bu = backup
         self.ws = ws
-        self.files = ('hgrc', 'localtags', 'patches')
+        self.files = ('hgrc', 'localtags', 'patches', 'cdm')
 
     def backup(self):
         '''Backup workspace metadata'''
--- a/usr/src/tools/onbld/Scm/WorkSpace.py	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/onbld/Scm/WorkSpace.py	Wed Aug 06 16:29:39 2008 -0600
@@ -17,8 +17,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Theory:
@@ -638,7 +636,7 @@
         self.activecache[parent] = act
         return act
 
-    def pdiff(self, parent=None):
+    def pdiff(self, pats, opts, parent=None):
         'Return diffs relative to PARENT, as best as we can make out'
 
         parent = self.parent(parent)
@@ -651,9 +649,12 @@
         if not act.revs:
             return
 
+        names, match = cmdutil.matchpats(self.repo, pats, opts)[:2]
+        opts = patch.diffopts(self.ui, opts)
+
         ret = cStringIO.StringIO()
         patch.diff(self.repo, act.parenttip.node(), act.localtip.node(),
-                   fp=ret)
+                   names, fp=ret, opts=opts, match=match)
         return ret.getvalue()
 
     #
--- a/usr/src/tools/onbld/hgext/cdm.py	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/onbld/hgext/cdm.py	Wed Aug 06 16:29:39 2008 -0600
@@ -17,8 +17,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 '''workspace extensions for mercurial
 
@@ -39,7 +37,7 @@
 #
 #     If you change that, change this
 #
-import sys, os
+import sys, os, stat, termios, atexit
 sys.path.insert(1, "%s/../../" % os.path.dirname(__file__))
 
 from onbld.Scm import Version
@@ -51,7 +49,7 @@
     raise util.Abort("Version Mismatch:\n %s\n" % badversion)
 
 import ConfigParser
-from mercurial import cmdutil, node
+from mercurial import cmdutil, node, ignore
 
 from onbld.Scm.WorkSpace import WorkSpace, ActiveEntry
 from onbld.Scm.Backup import CdmBackup
@@ -79,6 +77,62 @@
     else:
         return default
 
+
+def _buildfilelist(repo, args):
+    '''build a list of files in which we're interested
+
+    If no files are specified, then we'll default to using
+    the entire active list.
+
+    Returns a dictionary, wherein the keys are cwd-relative file paths,
+    and the values (when present) are entries from the active list.
+    Instead of warning the user explicitly about files not in the active
+    list, we'll attempt to do checks on them.'''
+
+    fdict = {}
+
+    #
+    # If the user specified files on the command line, we'll only check
+    # those files.  We won't pull the active list at all.  That means we
+    # won't be smart about skipping deleted files and such, so the user
+    # needs to be smart enough to not explicitly specify a nonexistent
+    # file path.  Which seems reasonable.
+    #
+    if args:
+        for f in args:
+            fdict[f] = None
+
+    #
+    # Otherwise, if no files were listed explicitly, we assume that the
+    # checks should be run on all files in the active list.  So we determine
+    # it here.
+    #
+    # Tracking the file paths is a slight optimization, in that multiple
+    # check functions won't need to derive it themselves.  This also dovetails
+    # nicely with the expectation that explicitly specified files will be
+    # ${CWD}-relative paths, so the fdict keyspace will be consistent either
+    # way.
+    #
+    else:
+        active = wslist[repo].active()
+        for e in sorted(active):
+            fdict[wslist[repo].filepath(e.name)] = e
+
+    return fdict
+
+
+def not_check(repo, cmd):
+    '''return a function which returns boolean indicating whether a file
+    should be skipped for CMD.'''
+
+    notfile = repo.join('cdm/%s.NOT' % cmd)
+
+    if os.path.exists(notfile):
+        return ignore.ignore(repo.root, [notfile], repo.ui.warn)
+    else:
+        return util.never
+
+
 #
 # Adding a reference to WorkSpace from a repo causes a circular reference
 # repo <-> WorkSpace.
@@ -93,18 +147,36 @@
 #
 wslist = {}
 
-
 def reposetup(ui, repo):
     if repo.local() and repo not in wslist:
         wslist[repo] = WorkSpace(repo)
 
+        ui.setconfig('hooks', 'preoutgoing.cdm_pbconfirm',
+                     'python:hgext_cdm.pbconfirm')
 
-def cdm_pdiffs(ui, repo, parent=None):
+def pbconfirm(ui, repo, hooktype, source):
+    def wrapper(settings=None):
+	    termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, settings)
+
+    if source == 'push':
+        if not yes_no(ui, "Are you sure you wish to push?", False):
+            return 1
+        else:
+            settings = termios.tcgetattr(sys.stdin.fileno())
+	    orig = list(settings)
+	    atexit.register(wrapper, orig)
+	    settings[3] = settings[3] & (~termios.ISIG) # c_lflag
+	    termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, settings)
+
+def cdm_pdiffs(ui, repo, *pats, **opts):
     '''list workspace diffs relative to parent workspace
 
     The parent tip is taken to be the latest revision shared between
     us and the parent workspace.'''
-    diffs = wslist[repo].pdiff(parent)
+
+    parent = opts['parent']
+
+    diffs = wslist[repo].pdiff(pats, opts, parent=parent)
     if diffs:
         ui.write(diffs)
 
@@ -197,43 +269,47 @@
 
     Check that checkin comments conform to O/N rules.'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    active = wslist[repo].active(opts.get('parent'))
 
     ui.write('Comments check:\n')
 
-    check_db = not opts['nocheck']
+    check_db = not opts.get('nocheck')
     return Comments.comchk(active.comments(), check_db=check_db, output=ui)
 
 
-def cdm_cddlchk(ui, repo, **opts):
+def cdm_cddlchk(ui, repo, *args, **opts):
     '''check for a valid CDDL block in active files
 
     See http://www.opensolaris.org/os/community/on/devref_toc/devref_7/#7_2_3_nonformatting_considerations
     for more info.'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    filelist = opts.get('filelist') or _buildfilelist(repo, args)
 
     ui.write('CDDL block check:\n')
 
     lenient = True
     ret = 0
 
-    for entry in sorted(active):
-        if entry.is_removed():
+    exclude = not_check(repo, 'cddlchk')
+
+    for f, e in filelist.iteritems():
+        if e and e.is_removed():
             continue
-        elif entry.is_added():
+        elif (e or opts.get('honour_nots')) and exclude(f):
+            ui.status('Skipping %s...\n' % f)
+            continue
+        elif e and e.is_added():
             lenient = False
         else:
             lenient = True
 
-        path = wslist[repo].filepath(entry.name)
-        fh = open(path, 'r')
+        fh = open(f, 'r')
         ret |= Cddl.cddlchk(fh, lenient=lenient, output=ui)
         fh.close()
     return ret
 
 
-def cdm_copyright(ui, repo, **opts):
+def cdm_copyright(ui, repo, *args, **opts):
     '''check active files for valid copyrights
 
     Check that all active files have a valid copyright containing the
@@ -241,110 +317,125 @@
     See http://www.opensolaris.org/os/project/muskoka/on_dev/golden_rules.txt
     for more info.'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    filelist = opts.get('filelist') or _buildfilelist(repo, args)
 
     ui.write('Copyright check:\n')
 
     ret = 0
+    exclude = not_check(repo, 'copyright')
 
-    for entry in sorted(active):
-        if entry.is_removed():
+    for f, e in filelist.iteritems():
+        if e and e.is_removed():
+            continue
+        elif (e or opts.get('honour_nots')) and exclude(f):
+            ui.status('Skipping %s...\n' % f)
             continue
 
-        path = wslist[repo].filepath(entry.name)
-
-        fh = open(path, 'r')
+        fh = open(f, 'r')
         ret |= Copyright.copyright(fh, output=ui)
         fh.close()
     return ret
 
 
-def cdm_hdrchk(ui, repo, **opts):
+def cdm_hdrchk(ui, repo, *args, **opts):
     '''check active header files conform to O/N rules'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    filelist = opts.get('filelist') or _buildfilelist(repo, args)
 
     ui.write('Header format check:\n')
 
     ret = 0
+    exclude = not_check(repo, 'hdrchk')
 
-    for entry in sorted(active):
-        if entry.is_removed():
+    for f, e in filelist.iteritems():
+        if e and e.is_removed():
+            continue
+        elif not f.endswith('.h'):
+            continue
+        elif (e or opts.get('honour_nots')) and exclude(f):
+            ui.status('Skipping %s...\n' % f)
             continue
 
-        path = wslist[repo].filepath(entry.name)
-
-        if entry.name.endswith('.h'):
-            fh = open(path, 'r')
-            ret |= HdrChk.hdrchk(fh, lenient=True, output=ui)
-            fh.close()
+        fh = open(f, 'r')
+        ret |= HdrChk.hdrchk(fh, lenient=True, output=ui)
+        fh.close()
     return ret
 
 
-def cdm_cstyle(ui, repo, **opts):
+def cdm_cstyle(ui, repo, *args, **opts):
     '''check active C source files conform to the C Style Guide
 
     See http://opensolaris.org/os/community/documentation/getting_started_docs/cstyle.ms.pdf'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    filelist = opts.get('filelist') or _buildfilelist(repo, args)
 
     ui.write('C style check:\n')
 
     ret = 0
+    exclude = not_check(repo, 'cstyle')
 
-    for entry in sorted(active):
-        if entry.is_removed():
+    for f, e in filelist.iteritems():
+        if e and e.is_removed():
+            continue
+        elif not (f.endswith('.c') or f.endswith('.h')):
+            continue
+        elif (e or opts.get('honour_nots')) and exclude(f):
+            ui.status('Skipping %s...\n' % f)
             continue
 
-        path = wslist[repo].filepath(entry.name)
-
-        if entry.name.endswith('.c') or entry.name.endswith('.h'):
-            fh = open(path, 'r')
-            ret |= CStyle.cstyle(fh, output=ui,
-                                 picky=True, check_posix_types=True,
-                                 check_continuation=True)
-            fh.close()
+        fh = open(f, 'r')
+        ret |= CStyle.cstyle(fh, output=ui,
+                             picky=True, check_posix_types=True,
+                             check_continuation=True)
+        fh.close()
     return ret
 
 
-def cdm_jstyle(ui, repo, **opts):
+def cdm_jstyle(ui, repo, *args, **opts):
     'check active Java source files for common stylistic errors'
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    filelist = opts.get('filelist') or _buildfilelist(repo, args)
 
     ui.write('Java style check:\n')
 
     ret = 0
+    exclude = not_check(repo, 'jstyle')
 
-    for entry in sorted(active):
-        if entry.is_removed():
+    for f, e in filelist.iteritems():
+        if e and e.is_removed():
+            continue
+        elif not f.endswith('.java'):
+            continue
+        elif (e or opts.get('honour_nots')) and exclude(f):
+            ui.status('Skipping %s...\n' % f)
             continue
 
-        path = wslist[repo].filepath(entry.name)
-
-        if entry.name.endswith('.java'):
-            fh = open(path, 'r')
-            ret |= JStyle.jstyle(fh, output=ui, picky=True)
-            fh.close()
+        fh = open(f, 'r')
+        ret |= JStyle.jstyle(fh, output=ui, picky=True)
+        fh.close()
     return ret
 
 
-def cdm_permchk(ui, repo, **opts):
+def cdm_permchk(ui, repo, *args, **opts):
     '''check active files permission - warn +x (execute) mode'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    filelist = opts.get('filelist') or _buildfilelist(repo, args)
 
     ui.write('File permission check:\n')
 
     exeFiles = []
-    for entry in sorted(active):
-        if entry.is_removed():
+    exclude = not_check(repo, 'permchk')
+
+    for f, e in filelist.iteritems():
+        if e and e.is_removed():
+            continue
+        elif (e or opts.get('honour_nots')) and exclude(f):
+            ui.status('Skipping %s...\n' % f)
             continue
 
-        path = wslist[repo].filepath(entry.name)
-
-        if active.localtip.manifest().execf(path):
-            exeFiles.append(path)
+        mode = stat.S_IMODE(os.stat(f)[stat.ST_MODE])
+        if mode & stat.S_IEXEC:
+            exeFiles.append(f)
 
     if len(exeFiles) > 0:
         ui.write('Warning: the following active file(s) have executable mode '
@@ -360,7 +451,7 @@
 
     Tag sharing among repositories is restricted to gatekeepers'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    active = wslist[repo].active(opts.get('parent'))
 
     ui.write('Checking for new tags:\n')
 
@@ -439,7 +530,7 @@
 
     Only works on SWAN.'''
 
-    if opts['nocheck']:
+    if opts.get('nocheck') or os.path.exists(repo.join('cdm/rtichk.NOT')):
         ui.status('Skipping RTI checks...\n')
         return 0
 
@@ -447,7 +538,8 @@
         ui.write('RTI checks only work on SWAN, skipping...\n')
         return 0
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    parent = wslist[repo].parent(opts.get('parent'))
+    active = wslist[repo].active(parent)
 
     ui.write('RTI check:\n')
 
@@ -459,23 +551,27 @@
             bugs.append(match.group(1))
 
     # RTI normalizes the gate path for us
-    return int(not Rti.rti(bugs, gatePath=opts['parent'], output=ui))
+    return int(not Rti.rti(bugs, gatePath=parent, output=ui))
 
 
-def cdm_keywords(ui, repo, **opts):
+def cdm_keywords(ui, repo, *args, **opts):
     '''check source files do not contain SCCS keywords'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    filelist = opts.get('filelist') or _buildfilelist(repo, args)
 
     ui.write('Keywords check:\n')
 
     ret = 0
-    for entry in sorted(active):
-        if entry.is_removed():
+    exclude = not_check(repo, 'keywords')
+
+    for f, e in filelist.iteritems():
+        if e and e.is_removed():
+            continue
+        elif (e or opts.get('honour_nots')) and exclude(f):
+            ui.status('Skipping %s...\n' % f)
             continue
 
-        path = wslist[repo].filepath(entry.name)
-        fh = open(path, 'r')
+        fh = open(f, 'r')
         ret |= Keywords.keywords(fh, output=ui)
         fh.close()
     return ret
@@ -503,7 +599,7 @@
 def cdm_mergechk(ui, repo, **opts):
     '''Warn the user if their workspace contains merges'''
 
-    active = opts.get('active') or wslist[repo].active(opts['parent'])
+    active = wslist[repo].active(opts.get('parent'))
 
     ui.write('Checking for merges:\n')
 
@@ -521,12 +617,13 @@
     return 0
 
 
-def run_checks(ws, cmds, **opts):
+def run_checks(ws, cmds, *args, **opts):
     '''Run CMDS (with OPTS) over active files in WS'''
-    active = ws.active(opts['parent'])
 
     ret = 0
 
+    flist = _buildfilelist(ws.repo, args)
+
     for cmd in cmds:
         name = cmd.func_name.split('_')[1]
         if not ws.ui.configbool('cdm', name, True):
@@ -534,7 +631,8 @@
         else:
             ws.ui.pushbuffer()
 
-            result = cmd(ws.ui, ws.repo, active=active, **opts)
+            result = cmd(ws.ui, ws.repo, filelist=flist,
+                         honour_nots=True, *args, **opts)
             ret |= result
 
             output = ws.ui.popbuffer()
@@ -543,7 +641,7 @@
     return ret
 
 
-def cdm_nits(ui, repo, **opts):
+def cdm_nits(ui, repo, *args, **opts):
     '''check for stylistic nits in active files
 
     Run cddlchk, copyright, cstyle, hdrchk, jstyle, permchk, and
@@ -557,10 +655,10 @@
         cdm_permchk,
         cdm_keywords]
 
-    return run_checks(wslist[repo], cmds, **opts)
+    return run_checks(wslist[repo], cmds, *args, **opts)
 
 
-def cdm_pbchk(ui, repo, **opts):
+def cdm_pbchk(ui, repo, *args, **opts):
     '''pre-putback check all active files
 
     Run cddlchk, comchk, copyright, cstyle, hdrchk, jstyle, permchk, tagchk,
@@ -586,7 +684,7 @@
         cdm_outchk,
         cdm_mergechk]
 
-    return run_checks(wslist[repo], cmds, **opts)
+    return run_checks(wslist[repo], cmds, *args, **opts)
 
 
 def cdm_recommit(ui, repo, **opts):
@@ -871,8 +969,22 @@
               'hg pbchk [-N] [-p PARENT]'),
     'permchk': (cdm_permchk, [('p', 'parent', '', 'parent workspace')],
                 'hg permchk [-p PARENT]'),
-    '^pdiffs': (cdm_pdiffs, [('p', 'parent', '', 'parent workspace')],
-               'hg pdiffs [-p PARENT]'),
+    '^pdiffs': (cdm_pdiffs, [('p', 'parent', '', 'parent workspace'),
+                             ('a', 'text', None, 'treat all files as text'),
+                             ('g', 'git', None, 'use extended git diff format'),
+                             ('w', 'ignore-all-space', None,
+                              'ignore white space when comparing lines'),
+                             ('b', 'ignore-space-change', None,
+                              'ignore changes in the amount of white space'),
+                             ('B', 'ignore-blank-lines', None,
+                              'ignore changes whos lines are all blank'),
+                             ('U', 'unified', 3,
+                              'number of lines of context to show'),
+                             ('I', 'include', [],
+                              'include names matching the given patterns'),
+                             ('X', 'exclude', [],
+                              'exclude names matching the given patterns')],
+               'hg pdiffs [OPTION...] [-p PARENT] [FILE...]'),
     '^recommit|reci': (cdm_recommit, [('p', 'parent', '', 'parent workspace'),
                                       ('f', 'force', None, 'force operation'),
                                       ('m', 'message', '',
--- a/usr/src/tools/scripts/acr.1	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/scripts/acr.1	Wed Aug 06 16:29:39 2008 -0600
@@ -1,4 +1,3 @@
-.\" ident	"%Z%%M%	%I%	%E% SMI"
 .\" " CDDL HEADER START
 .\" "
 .\" " The contents of this file are subject to the terms of the
@@ -20,7 +19,7 @@
 .\" "
 .\" " Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 .\" " Use is subject to license terms.
-.TH acr 1 "%H%"
+.TH acr 1 "July 13, 2006"
 .SH NAME
 .I acr
 \- Automatically attempt BFU conflict resolution.
--- a/usr/src/tools/scripts/hg-active.py	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/scripts/hg-active.py	Wed Aug 06 16:29:39 2008 -0600
@@ -18,8 +18,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 '''
 Create a wx-style active list on stdout based on a Mercurial
@@ -42,7 +40,7 @@
     sys.exit(1)
 
 import getopt, binascii
-from mercurial import hg, repo
+from mercurial import hg, repo, util
 from onbld.Scm.WorkSpace import WorkSpace
 
 def usage():
@@ -52,17 +50,20 @@
 
 def main(argv):
     try:
-        opts, args = getopt.getopt(argv, 'w:p:')
+        opts = getopt.getopt(argv, 'w:o:p:')[0]
     except getopt.GetoptError, e:
         sys.stderr.write(str(e) + '\n')
         usage()
 
     parentpath = None
     wspath = None
+    outputfile = None
 
     for opt, arg in opts:
         if opt == '-w':
             wspath = arg
+        elif opt == '-o':
+            outputfile = arg
         elif opt == '-p':
             parentpath = arg
 
@@ -74,36 +75,50 @@
     except repo.RepoError, e:
         sys.stderr.write("failed to open repository: %s\n" % e)
         sys.exit(1)
-
+    
     ws = WorkSpace(repository)
     act = ws.active(parentpath)
 
     node = act.parenttip.node()
     parenttip = binascii.hexlify(node)
-    print "HG_PARENT=" + parenttip
+
+    fh = None
+    if outputfile:
+        try:
+            fh = open(outputfile, 'w')
+        except EnvironmentError, e:
+            sys.stderr.write("could not open output file: %s\n" % e)
+            sys.exit(1)
+    else:
+        fh = sys.stdout
+
+    fh.write("HG_PARENT=%s\n" % parenttip)
 
     entries = [i for i in act]
     entries.sort()
 
     for entry in entries:
         if entry.is_renamed():
-            print "%s %s" % (entry.name, entry.parentname)
+            fh.write("%s %s\n" % (entry.name, entry.parentname))
         else:
-            print entry.name
+            fh.write("%s\n" % entry.name)
 
         # Strip blank lines.
         comments = filter(lambda x: x and not x.isspace(),
                           entry.comments)
 
-        print
+        fh.write('\n')
         if comments:
-            print '\n'.join(comments)
+            fh.write('%s\n' % '\n'.join(comments))
         else:
-            print "*** NO COMMENTS ***"
-        print
+            fh.write("*** NO COMMENTS ***\n")
+        fh.write('\n')
 
 if __name__ == '__main__':
     try:
         main(sys.argv[1:])
     except KeyboardInterrupt:
         sys.exit(1)
+    except util.Abort, msg:
+        sys.stderr.write("Abort: %s\n" % msg)
+        sys.exit(1)
--- a/usr/src/tools/scripts/hgsetup.sh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/scripts/hgsetup.sh	Wed Aug 06 16:29:39 2008 -0600
@@ -24,8 +24,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Easy setup script for populating a user's ~/.hgrc
@@ -116,6 +114,7 @@
 if getent hosts sunweb.central.sun.com >/dev/null; then
 	# on SWAN
 	echo "Detected SWAN connection"
+	ON_SWAN=1
 	ldapemail='preferredrfc822recipient'
 	ldapquery="uid=$login $ldapemail"
 	ldapcmd="$LDAPCLIENT -1 -h sun-ds -b dc=sun,dc=com $ldapquery"
@@ -163,8 +162,24 @@
 from=$email
 
 [paths]
-onnv-gate=ssh://anon@hg.opensolaris.org/hg/onnv/onnv-gate
+EOF
+
+if [[ -n $ON_SWAN ]]; then
+	cat <<EOF >> $HGRC
+onnv-gate=ssh://onnv.sfbay.sun.com//export/onnv-gate
+onnv-clone=ssh://onnv.sfbay.sun.com//export/onnv-clone
+onnv-closed=ssh://onnv.sfbay.sun.com//export/onnv-gate/usr/closed
+onnv-closed-clone=ssh://onnv.sfbay.sun.com//export/onnv-clone/usr/closed
 
+EOF
+else
+	cat <<EOF >> $HGRC
+onnv-gate=ssh://anon@hg.opensolaris.org//hg/onnv/onnv-gate
+
+EOF
+fi
+
+cat <<EOF >> $HGRC
 [merge-tools]
 filemerge.gui=True
 filemerge.args=-a \$base \$local \$other \$output
--- a/usr/src/tools/scripts/webrev.sh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/scripts/webrev.sh	Wed Aug 06 16:29:39 2008 -0600
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -35,13 +35,6 @@
 # man page.
 #
 
-#
-# The following variable is set to SCCS delta date 20YY/MM/DD.
-# Note this will have to be changed in 2100 or when SCCS has support for
-# 4 digit years; whichever is the sooner!
-#
-WEBREV_UPDATED=20%E%
-
 REMOVED_COLOR=brown
 CHANGED_COLOR=blue
 NEW_COLOR=blue
@@ -1396,7 +1389,7 @@
 	typeset parent=$2
 
 	TMPFLIST=/tmp/$$.active
-	$HG_ACTIVE -w $child -p $parent > $TMPFLIST
+	$HG_ACTIVE -w $child -p $parent -o $TMPFLIST
 	wxfile=$TMPFLIST
 }
 
@@ -2824,8 +2817,7 @@
 print
 print "<hr></hr>"
 print "<p style=\"font-size: small\">"
-print "This code review page was prepared using <b>$0</b>"
-print "(vers $WEBREV_UPDATED)."
+print "This code review page was prepared using <b>$0</b>."
 print "Webrev is maintained by the <a href=\"http://www.opensolaris.org\">"
 print "OpenSolaris</a> project.  The latest version may be obtained"
 print "<a href=\"http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/tools/scripts/webrev.sh\">here</a>.</p>"
--- a/usr/src/tools/scripts/wx.sh	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/tools/scripts/wx.sh	Wed Aug 06 16:29:39 2008 -0600
@@ -25,17 +25,18 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # 
-#ident	"@(#)wx	1.12	98/11/09 SMI" (from bonwick)
-#ident  "@(#)wxx 1.26     03/01/23 SMI" (from fiveash)
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 # wx -- workspace extensions.  Jeff Bonwick, December 1992.
 
 # The bugster cat/subcat = consolidation/os-net-tools
 
 version() {
-	echo "%Z%%M%	%I%	%E% SMI"
+	if [[ $(whence $0) = "/opt/onbld/bin/wx" ]] && \
+	    pkginfo SUNWonbld > /dev/null 2>&1; then
+		pkginfo -l SUNWonbld | egrep "PKGINST:|VERSION:|PSTAMP:"
+	else
+		ls -l $(whence $0)
+	fi    
 }
 
 ring_bell() {
--- a/usr/src/ucbcmd/sbcp/sbcp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/ucbcmd/sbcp/sbcp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -23,9 +23,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"sbcp.s"
 
 #include <sys/asm_linkage.h>
 #include <sys/link.h>
--- a/usr/src/ucblib/libucb/sparc/sys/setjmp.s	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/ucblib/libucb/sparc/sys/setjmp.s	Wed Aug 06 16:29:39 2008 -0600
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.file	"%M%"
+	.file	"setjmp.s"
 
 /*
  * The UCB setjmp(env) is the same as SYSV's sigsetjmp(env, 1)
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/asym_sun.c	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/asym_sun.c	Wed Aug 06 16:29:39 2008 -0600
@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Implementation of "scsi_vhci_f_asym_sun" asymmetric failover_ops.
@@ -50,7 +50,7 @@
 };
 
 /* Failover module plumbing. */
-SCSI_FAILOVER_OP("f_asym_sun", purple, "%I%");
+SCSI_FAILOVER_OP("f_asym_sun", purple);
 
 #define	PURPLE_FO_CMD_RETRY_DELAY	1000000 /* 1 seconds */
 #define	PURPLE_FO_RETRY_DELAY		2000000 /* 2 seconds */
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/sym.c	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/sym.c	Wed Aug 06 16:29:39 2008 -0600
@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Implementation of "scsi_vhci_f_sym" symmetric failover_ops.
@@ -69,7 +69,7 @@
 };
 
 /* Failover module plumbing. */
-SCSI_FAILOVER_OP(SFO_NAME_SYM, symmetric, "%I%");
+SCSI_FAILOVER_OP(SFO_NAME_SYM, symmetric);
 
 /* ARGSUSED */
 static int
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tape.c	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tape.c	Wed Aug 06 16:29:39 2008 -0600
@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Implementation of "scsi_vhci_f_tape" tape failover_ops.
@@ -50,7 +50,7 @@
 };
 
 /* Failover module plumbing. */
-SCSI_FAILOVER_OP("f_tape", tape, "%I%");
+SCSI_FAILOVER_OP("f_tape", tape);
 
 /* ARGSUSED */
 static int
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c	Wed Aug 06 16:29:39 2008 -0600
@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Implementation of "scsi_vhci_f_tpgs" T10 standard based failover_ops.
@@ -42,7 +42,7 @@
 char	*std_dev_table[] = { NULL };
 
 /* Failover module plumbing. */
-SCSI_FAILOVER_OP(SFO_NAME_TPGS, std, "%I%");
+SCSI_FAILOVER_OP(SFO_NAME_TPGS, std);
 
 #define	STD_FO_CMD_RETRY_DELAY	1000000 /* 1 seconds */
 #define	STD_FO_RETRY_DELAY	2000000 /* 2 seconds */
--- a/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h	Wed Aug 06 14:32:11 2008 -0700
+++ b/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h	Wed Aug 06 16:29:39 2008 -0600
@@ -18,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -26,8 +27,6 @@
 #ifndef	_SYS_SCSI_ADAPTERS_SCSI_VHCI_H
 #define	_SYS_SCSI_ADAPTERS_SCSI_VHCI_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Multiplexed I/O SCSI vHCI global include
  */
@@ -620,9 +619,9 @@
 /*
  * Macro to provide plumbing for basic failover module
  */
-#define	_SCSI_FAILOVER_OP(sfo_name, local_name, ops_name, vers)		\
+#define	_SCSI_FAILOVER_OP(sfo_name, local_name, ops_name)		\
 	static struct modlmisc modlmisc = {				\
-		&mod_miscops, sfo_name  " " vers			\
+		&mod_miscops, sfo_name					\
 	};								\
 	static struct modlinkage modlinkage = {				\
 		MODREV_1, (void *)&modlmisc, NULL			\
@@ -674,11 +673,11 @@
 	}
 
 #ifdef	lint
-#define	SCSI_FAILOVER_OP(sfo_name, local_name, vers)			\
-	_SCSI_FAILOVER_OP(sfo_name, local_name, local_name, vers)
+#define	SCSI_FAILOVER_OP(sfo_name, local_name)				\
+	_SCSI_FAILOVER_OP(sfo_name, local_name, local_name)
 #else	/* lint */
-#define	SCSI_FAILOVER_OP(sfo_name, local_name, vers)			\
-	_SCSI_FAILOVER_OP(sfo_name, local_name, scsi_vhci, vers)
+#define	SCSI_FAILOVER_OP(sfo_name, local_name)				\
+	_SCSI_FAILOVER_OP(sfo_name, local_name, scsi_vhci)
 #endif	/* lint */
 
 /*