summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2005-08-08 08:05:39 +0000
committerMarc Espie <espie@cvs.openbsd.org>2005-08-08 08:05:39 +0000
commit09c68f18c4a9147d6181993dbc13fa43f69a6887 (patch)
tree29ce24055216c4cd6d82d1410987040632c858b6 /lib
parent1c72a646a8e39b93297b437918b3b1471ce8e77a (diff)
zap remaining rcsid.
Kill old files that are no longer compiled. okay theo
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/compat-43/creat.c5
-rw-r--r--lib/libc/compat-43/getdtablesize.c5
-rw-r--r--lib/libc/compat-43/gethostid.c5
-rw-r--r--lib/libc/compat-43/getwd.c5
-rw-r--r--lib/libc/compat-43/killpg.c4
-rw-r--r--lib/libc/compat-43/sethostid.c5
-rw-r--r--lib/libc/compat-43/setpgrp.c5
-rw-r--r--lib/libc/compat-43/sigcompat.c4
-rw-r--r--lib/libc/crypt/crypt.c6
-rw-r--r--lib/libc/crypt/crypt2.c6
-rw-r--r--lib/libc/crypt/md5crypt.c6
-rw-r--r--lib/libc/db/btree/bt_debug.c10
-rw-r--r--lib/libc/db/hash/ndbm.c10
-rw-r--r--lib/libc/gen/_sys_errlist.c9
-rw-r--r--lib/libc/gen/_sys_nerr.c5
-rw-r--r--lib/libc/gen/_sys_siglist.c9
-rw-r--r--lib/libc/gen/alarm.c5
-rw-r--r--lib/libc/gen/assert.c5
-rw-r--r--lib/libc/gen/basename.c6
-rw-r--r--lib/libc/gen/clock.c5
-rw-r--r--lib/libc/gen/closedir.c5
-rw-r--r--lib/libc/gen/confstr.c5
-rw-r--r--lib/libc/gen/ctermid.c5
-rw-r--r--lib/libc/gen/ctype_.c5
-rw-r--r--lib/libc/gen/daemon.c5
-rw-r--r--lib/libc/gen/devname.c5
-rw-r--r--lib/libc/gen/dirname.c6
-rw-r--r--lib/libc/gen/disklabel.c4
-rw-r--r--lib/libc/gen/elf_hash.c5
-rw-r--r--lib/libc/gen/err.c5
-rw-r--r--lib/libc/gen/errlist.c5
-rw-r--r--lib/libc/gen/errno.c5
-rw-r--r--lib/libc/gen/errx.c5
-rw-r--r--lib/libc/gen/exec.c5
-rw-r--r--lib/libc/gen/fnmatch.c10
-rw-r--r--lib/libc/gen/frexp.c6
-rw-r--r--lib/libc/gen/fstab.c5
-rw-r--r--lib/libc/gen/ftok.c5
-rw-r--r--lib/libc/gen/fts.c10
-rw-r--r--lib/libc/gen/ftw.c6
-rw-r--r--lib/libc/gen/getbsize.c5
-rw-r--r--lib/libc/gen/getcap.c5
-rw-r--r--lib/libc/gen/getcwd.c5
-rw-r--r--lib/libc/gen/getdomainname.c5
-rw-r--r--lib/libc/gen/getgrent.c5
-rw-r--r--lib/libc/gen/getgrouplist.c5
-rw-r--r--lib/libc/gen/gethostname.c5
-rw-r--r--lib/libc/gen/getloadavg.c5
-rw-r--r--lib/libc/gen/getlogin.c5
-rw-r--r--lib/libc/gen/getmntinfo.c5
-rw-r--r--lib/libc/gen/getnetgrent.c6
-rw-r--r--lib/libc/gen/getpagesize.c5
-rw-r--r--lib/libc/gen/getpwent.c5
-rw-r--r--lib/libc/gen/getttyent.c5
-rw-r--r--lib/libc/gen/getusershell.c5
-rw-r--r--lib/libc/gen/glob.c9
-rw-r--r--lib/libc/gen/initgroups.c5
-rw-r--r--lib/libc/gen/isatty.c5
-rw-r--r--lib/libc/gen/isctype.c5
-rw-r--r--lib/libc/gen/isfdtype.c6
-rw-r--r--lib/libc/gen/lockf.c6
-rw-r--r--lib/libc/gen/nftw.c6
-rw-r--r--lib/libc/gen/nice.c4
-rw-r--r--lib/libc/gen/nlist.c5
-rw-r--r--lib/libc/gen/opendir.c5
-rw-r--r--lib/libc/gen/pause.c6
-rw-r--r--lib/libc/gen/popen.c5
-rw-r--r--lib/libc/gen/psignal.c5
-rw-r--r--lib/libc/gen/pw_dup.c6
-rw-r--r--lib/libc/gen/pwcache.c5
-rw-r--r--lib/libc/gen/raise.c5
-rw-r--r--lib/libc/gen/readdir.c5
-rw-r--r--lib/libc/gen/readpassphrase.c6
-rw-r--r--lib/libc/gen/rewinddir.c5
-rw-r--r--lib/libc/gen/scandir.c5
-rw-r--r--lib/libc/gen/seekdir.c5
-rw-r--r--lib/libc/gen/setdomainname.c5
-rw-r--r--lib/libc/gen/sethostname.c5
-rw-r--r--lib/libc/gen/setjmperr.c5
-rw-r--r--lib/libc/gen/setmode.c10
-rw-r--r--lib/libc/gen/setproctitle.c5
-rw-r--r--lib/libc/gen/siginterrupt.c5
-rw-r--r--lib/libc/gen/siglist.c5
-rw-r--r--lib/libc/gen/signal.c5
-rw-r--r--lib/libc/gen/signame.c5
-rw-r--r--lib/libc/gen/sigsetops.c5
-rw-r--r--lib/libc/gen/sleep.c5
-rw-r--r--lib/libc/gen/strtofflags.c13
-rw-r--r--lib/libc/gen/sysconf.c5
-rw-r--r--lib/libc/gen/sysctl.c5
-rw-r--r--lib/libc/gen/syslog.c5
-rw-r--r--lib/libc/gen/telldir.c5
-rw-r--r--lib/libc/gen/time.c5
-rw-r--r--lib/libc/gen/times.c5
-rw-r--r--lib/libc/gen/timezone.c5
-rw-r--r--lib/libc/gen/tolower_.c5
-rw-r--r--lib/libc/gen/toupper_.c5
-rw-r--r--lib/libc/gen/ttyname.c5
-rw-r--r--lib/libc/gen/ttyslot.c5
-rw-r--r--lib/libc/gen/ualarm.c5
-rw-r--r--lib/libc/gen/uname.c5
-rw-r--r--lib/libc/gen/unvis.c5
-rw-r--r--lib/libc/gen/usleep.c5
-rw-r--r--lib/libc/gen/utime.c5
-rw-r--r--lib/libc/gen/valloc.c5
-rw-r--r--lib/libc/gen/verr.c5
-rw-r--r--lib/libc/gen/verrx.c5
-rw-r--r--lib/libc/gen/vis.c5
-rw-r--r--lib/libc/gen/vwarn.c5
-rw-r--r--lib/libc/gen/vwarnx.c5
-rw-r--r--lib/libc/gen/wait.c5
-rw-r--r--lib/libc/gen/wait3.c5
-rw-r--r--lib/libc/gen/waitpid.c5
-rw-r--r--lib/libc/gen/warn.c5
-rw-r--r--lib/libc/gen/warnx.c5
-rw-r--r--lib/libc/gmon/gmon.c5
-rw-r--r--lib/libc/gmon/mcount.c5
-rw-r--r--lib/libc/hash/helper.c6
-rw-r--r--lib/libc/hash/md4.c6
-rw-r--r--lib/libc/hash/md5.c6
-rw-r--r--lib/libc/hash/rmd160.c4
-rw-r--r--lib/libc/hash/sha1.c6
-rw-r--r--lib/libc/hash/sha2.c6
-rw-r--r--lib/libc/locale/__mb_cur_max.c6
-rw-r--r--lib/libc/locale/_def_messages.c5
-rw-r--r--lib/libc/locale/_def_monetary.c5
-rw-r--r--lib/libc/locale/_def_numeric.c5
-rw-r--r--lib/libc/locale/_def_time.c5
-rw-r--r--lib/libc/locale/iswctype_sb.c229
-rw-r--r--lib/libc/locale/localeconv.c5
-rw-r--r--lib/libc/locale/mbrtowc_sb.c6
-rw-r--r--lib/libc/locale/multibyte_sb.c6
-rw-r--r--lib/libc/locale/nl_langinfo.c5
-rw-r--r--lib/libc/locale/setlocale.c6
-rw-r--r--lib/libc/locale/wcstol.c6
-rw-r--r--lib/libc/locale/wcstoll.c6
-rw-r--r--lib/libc/locale/wcstoul.c6
-rw-r--r--lib/libc/locale/wcstoull.c6
-rw-r--r--lib/libc/quad/TESTS/divrem.c11
-rw-r--r--lib/libc/quad/TESTS/mul.c12
-rw-r--r--lib/libc/quad/adddi3.c5
-rw-r--r--lib/libc/quad/anddi3.c5
-rw-r--r--lib/libc/quad/ashldi3.c5
-rw-r--r--lib/libc/quad/ashrdi3.c5
-rw-r--r--lib/libc/quad/cmpdi2.c5
-rw-r--r--lib/libc/quad/divdi3.c5
-rw-r--r--lib/libc/quad/fixdfdi.c5
-rw-r--r--lib/libc/quad/fixsfdi.c5
-rw-r--r--lib/libc/quad/fixunsdfdi.c5
-rw-r--r--lib/libc/quad/fixunssfdi.c5
-rw-r--r--lib/libc/quad/floatdidf.c5
-rw-r--r--lib/libc/quad/floatdisf.c5
-rw-r--r--lib/libc/quad/floatunsdidf.c5
-rw-r--r--lib/libc/quad/iordi3.c5
-rw-r--r--lib/libc/quad/lshldi3.c5
-rw-r--r--lib/libc/quad/lshrdi3.c5
-rw-r--r--lib/libc/quad/moddi3.c5
-rw-r--r--lib/libc/quad/muldi3.c5
-rw-r--r--lib/libc/quad/negdi2.c5
-rw-r--r--lib/libc/quad/notdi2.c5
-rw-r--r--lib/libc/quad/qdivrem.c5
-rw-r--r--lib/libc/quad/subdi3.c5
-rw-r--r--lib/libc/quad/ucmpdi2.c5
-rw-r--r--lib/libc/quad/udivdi3.c5
-rw-r--r--lib/libc/quad/umoddi3.c5
-rw-r--r--lib/libc/quad/xordi3.c5
-rw-r--r--lib/libc/rpc/auth_none.c5
-rw-r--r--lib/libc/rpc/auth_unix.c5
-rw-r--r--lib/libc/rpc/authunix_prot.c5
-rw-r--r--lib/libc/rpc/clnt_generic.c5
-rw-r--r--lib/libc/rpc/clnt_perror.c5
-rw-r--r--lib/libc/rpc/clnt_raw.c5
-rw-r--r--lib/libc/rpc/clnt_simple.c6
-rw-r--r--lib/libc/rpc/clnt_tcp.c5
-rw-r--r--lib/libc/rpc/clnt_udp.c5
-rw-r--r--lib/libc/rpc/get_myaddress.c5
-rw-r--r--lib/libc/rpc/getrpcent.c5
-rw-r--r--lib/libc/rpc/getrpcport.c5
-rw-r--r--lib/libc/rpc/pmap_clnt.c5
-rw-r--r--lib/libc/rpc/pmap_getmaps.c5
-rw-r--r--lib/libc/rpc/pmap_getport.c5
-rw-r--r--lib/libc/rpc/pmap_prot.c5
-rw-r--r--lib/libc/rpc/pmap_prot2.c5
-rw-r--r--lib/libc/rpc/pmap_rmt.c5
-rw-r--r--lib/libc/rpc/rpc_callmsg.c5
-rw-r--r--lib/libc/rpc/rpc_commondata.c5
-rw-r--r--lib/libc/rpc/rpc_dtablesize.c5
-rw-r--r--lib/libc/rpc/rpc_prot.c5
-rw-r--r--lib/libc/rpc/svc.c5
-rw-r--r--lib/libc/rpc/svc_auth.c5
-rw-r--r--lib/libc/rpc/svc_auth_unix.c5
-rw-r--r--lib/libc/rpc/svc_raw.c5
-rw-r--r--lib/libc/rpc/svc_run.c5
-rw-r--r--lib/libc/rpc/svc_simple.c5
-rw-r--r--lib/libc/rpc/svc_tcp.c5
-rw-r--r--lib/libc/rpc/svc_udp.c5
-rw-r--r--lib/libc/rpc/xdr.c5
-rw-r--r--lib/libc/rpc/xdr_array.c5
-rw-r--r--lib/libc/rpc/xdr_float.c5
-rw-r--r--lib/libc/rpc/xdr_mem.c5
-rw-r--r--lib/libc/rpc/xdr_rec.c5
-rw-r--r--lib/libc/rpc/xdr_reference.c5
-rw-r--r--lib/libc/rpc/xdr_stdio.c5
-rw-r--r--lib/libc/stdio/asprintf.c6
-rw-r--r--lib/libc/stdio/clrerr.c5
-rw-r--r--lib/libc/stdio/fclose.c5
-rw-r--r--lib/libc/stdio/fdopen.c5
-rw-r--r--lib/libc/stdio/feof.c5
-rw-r--r--lib/libc/stdio/ferror.c5
-rw-r--r--lib/libc/stdio/fflush.c5
-rw-r--r--lib/libc/stdio/fgetc.c5
-rw-r--r--lib/libc/stdio/fgetln.c5
-rw-r--r--lib/libc/stdio/fgetpos.c5
-rw-r--r--lib/libc/stdio/fgets.c5
-rw-r--r--lib/libc/stdio/fgetws.c6
-rw-r--r--lib/libc/stdio/fileno.c5
-rw-r--r--lib/libc/stdio/findfp.c5
-rw-r--r--lib/libc/stdio/flags.c5
-rw-r--r--lib/libc/stdio/fopen.c5
-rw-r--r--lib/libc/stdio/fprintf.c5
-rw-r--r--lib/libc/stdio/fpurge.c5
-rw-r--r--lib/libc/stdio/fputc.c5
-rw-r--r--lib/libc/stdio/fputs.c5
-rw-r--r--lib/libc/stdio/fputws.c6
-rw-r--r--lib/libc/stdio/fread.c5
-rw-r--r--lib/libc/stdio/freopen.c5
-rw-r--r--lib/libc/stdio/fscanf.c5
-rw-r--r--lib/libc/stdio/fseek.c5
-rw-r--r--lib/libc/stdio/fsetpos.c5
-rw-r--r--lib/libc/stdio/ftell.c5
-rw-r--r--lib/libc/stdio/funopen.c5
-rw-r--r--lib/libc/stdio/fvwrite.c5
-rw-r--r--lib/libc/stdio/fwalk.c5
-rw-r--r--lib/libc/stdio/fwrite.c5
-rw-r--r--lib/libc/stdio/getc.c5
-rw-r--r--lib/libc/stdio/getchar.c5
-rw-r--r--lib/libc/stdio/gets.c5
-rw-r--r--lib/libc/stdio/getw.c5
-rw-r--r--lib/libc/stdio/makebuf.c5
-rw-r--r--lib/libc/stdio/mktemp.c5
-rw-r--r--lib/libc/stdio/perror.c5
-rw-r--r--lib/libc/stdio/printf.c5
-rw-r--r--lib/libc/stdio/putc.c5
-rw-r--r--lib/libc/stdio/putchar.c5
-rw-r--r--lib/libc/stdio/puts.c5
-rw-r--r--lib/libc/stdio/putw.c5
-rw-r--r--lib/libc/stdio/refill.c5
-rw-r--r--lib/libc/stdio/remove.c10
-rw-r--r--lib/libc/stdio/rewind.c5
-rw-r--r--lib/libc/stdio/rget.c5
-rw-r--r--lib/libc/stdio/scanf.c5
-rw-r--r--lib/libc/stdio/setbuf.c5
-rw-r--r--lib/libc/stdio/setbuffer.c5
-rw-r--r--lib/libc/stdio/setvbuf.c5
-rw-r--r--lib/libc/stdio/snprintf.c5
-rw-r--r--lib/libc/stdio/sprintf.c5
-rw-r--r--lib/libc/stdio/sscanf.c5
-rw-r--r--lib/libc/stdio/stdio.c5
-rw-r--r--lib/libc/stdio/tempnam.c5
-rw-r--r--lib/libc/stdio/tmpfile.c5
-rw-r--r--lib/libc/stdio/tmpnam.c5
-rw-r--r--lib/libc/stdio/ungetc.c5
-rw-r--r--lib/libc/stdio/vasprintf.c6
-rw-r--r--lib/libc/stdio/vfprintf.c5
-rw-r--r--lib/libc/stdio/vfscanf.c5
-rw-r--r--lib/libc/stdio/vprintf.c5
-rw-r--r--lib/libc/stdio/vscanf.c5
-rw-r--r--lib/libc/stdio/vsnprintf.c5
-rw-r--r--lib/libc/stdio/vsprintf.c5
-rw-r--r--lib/libc/stdio/vsscanf.c5
-rw-r--r--lib/libc/stdio/wbuf.c5
-rw-r--r--lib/libc/stdio/wsetup.c5
-rw-r--r--lib/libc/stdlib/_Exit.c6
-rw-r--r--lib/libc/stdlib/_rand48.c5
-rw-r--r--lib/libc/stdlib/a64l.c5
-rw-r--r--lib/libc/stdlib/abort.c5
-rw-r--r--lib/libc/stdlib/abs.c5
-rw-r--r--lib/libc/stdlib/atexit.c5
-rw-r--r--lib/libc/stdlib/atof.c5
-rw-r--r--lib/libc/stdlib/atoi.c5
-rw-r--r--lib/libc/stdlib/atol.c5
-rw-r--r--lib/libc/stdlib/atoll.c5
-rw-r--r--lib/libc/stdlib/bsearch.c4
-rw-r--r--lib/libc/stdlib/calloc.c5
-rw-r--r--lib/libc/stdlib/cfree.c6
-rw-r--r--lib/libc/stdlib/div.c5
-rw-r--r--lib/libc/stdlib/drand48.c5
-rw-r--r--lib/libc/stdlib/ecvt.c6
-rw-r--r--lib/libc/stdlib/erand48.c5
-rw-r--r--lib/libc/stdlib/exit.c5
-rw-r--r--lib/libc/stdlib/gcvt.c6
-rw-r--r--lib/libc/stdlib/getenv.c5
-rw-r--r--lib/libc/stdlib/getopt_long.c6
-rw-r--r--lib/libc/stdlib/getsubopt.c10
-rw-r--r--lib/libc/stdlib/hcreate.c11
-rw-r--r--lib/libc/stdlib/heapsort.c4
-rw-r--r--lib/libc/stdlib/insque.c6
-rw-r--r--lib/libc/stdlib/jrand48.c5
-rw-r--r--lib/libc/stdlib/l64a.c5
-rw-r--r--lib/libc/stdlib/labs.c5
-rw-r--r--lib/libc/stdlib/lcong48.c5
-rw-r--r--lib/libc/stdlib/ldiv.c5
-rw-r--r--lib/libc/stdlib/llabs.c9
-rw-r--r--lib/libc/stdlib/lrand48.c5
-rw-r--r--lib/libc/stdlib/malloc.c5
-rw-r--r--lib/libc/stdlib/merge.c5
-rw-r--r--lib/libc/stdlib/mrand48.c5
-rw-r--r--lib/libc/stdlib/multibyte.c120
-rw-r--r--lib/libc/stdlib/nrand48.c5
-rw-r--r--lib/libc/stdlib/putenv.c5
-rw-r--r--lib/libc/stdlib/qabs.c5
-rw-r--r--lib/libc/stdlib/qdiv.c5
-rw-r--r--lib/libc/stdlib/qsort.c5
-rw-r--r--lib/libc/stdlib/radixsort.c5
-rw-r--r--lib/libc/stdlib/rand.c4
-rw-r--r--lib/libc/stdlib/random.c5
-rw-r--r--lib/libc/stdlib/realpath.c10
-rw-r--r--lib/libc/stdlib/remque.c6
-rw-r--r--lib/libc/stdlib/seed48.c5
-rw-r--r--lib/libc/stdlib/setenv.c5
-rw-r--r--lib/libc/stdlib/srand48.c5
-rw-r--r--lib/libc/stdlib/strtod.c5
-rw-r--r--lib/libc/stdlib/strtol.c5
-rw-r--r--lib/libc/stdlib/strtoll.c4
-rw-r--r--lib/libc/stdlib/strtoul.c5
-rw-r--r--lib/libc/stdlib/strtoull.c5
-rw-r--r--lib/libc/stdlib/system.c5
-rw-r--r--lib/libc/string/bcmp.c6
-rw-r--r--lib/libc/string/bcopy.c5
-rw-r--r--lib/libc/string/bm.c5
-rw-r--r--lib/libc/string/bzero.c6
-rw-r--r--lib/libc/string/ffs.c6
-rw-r--r--lib/libc/string/index.c5
-rw-r--r--lib/libc/string/memccpy.c10
-rw-r--r--lib/libc/string/memchr.c5
-rw-r--r--lib/libc/string/memcmp.c5
-rw-r--r--lib/libc/string/memset.c5
-rw-r--r--lib/libc/string/rindex.c5
-rw-r--r--lib/libc/string/strcasecmp.c10
-rw-r--r--lib/libc/string/strcasestr.c6
-rw-r--r--lib/libc/string/strcat.c6
-rw-r--r--lib/libc/string/strcmp.c6
-rw-r--r--lib/libc/string/strcoll.c5
-rw-r--r--lib/libc/string/strcpy.c6
-rw-r--r--lib/libc/string/strcspn.c5
-rw-r--r--lib/libc/string/strdup.c10
-rw-r--r--lib/libc/string/strerror.c5
-rw-r--r--lib/libc/string/strerror_r.c6
-rw-r--r--lib/libc/string/strlcat.c6
-rw-r--r--lib/libc/string/strlcpy.c6
-rw-r--r--lib/libc/string/strlen.c6
-rw-r--r--lib/libc/string/strmode.c5
-rw-r--r--lib/libc/string/strncat.c5
-rw-r--r--lib/libc/string/strncmp.c6
-rw-r--r--lib/libc/string/strncpy.c6
-rw-r--r--lib/libc/string/strpbrk.c5
-rw-r--r--lib/libc/string/strsep.c10
-rw-r--r--lib/libc/string/strsignal.c4
-rw-r--r--lib/libc/string/strspn.c5
-rw-r--r--lib/libc/string/strstr.c5
-rw-r--r--lib/libc/string/strtok.c4
-rw-r--r--lib/libc/string/strxfrm.c5
-rw-r--r--lib/libc/string/swab.c5
-rw-r--r--lib/libc/string/wcscat.c6
-rw-r--r--lib/libc/string/wcschr.c6
-rw-r--r--lib/libc/string/wcscmp.c6
-rw-r--r--lib/libc/string/wcscpy.c6
-rw-r--r--lib/libc/string/wcscspn.c6
-rw-r--r--lib/libc/string/wcslcat.c6
-rw-r--r--lib/libc/string/wcslcpy.c6
-rw-r--r--lib/libc/string/wcslen.c6
-rw-r--r--lib/libc/string/wcsncat.c6
-rw-r--r--lib/libc/string/wcsncmp.c6
-rw-r--r--lib/libc/string/wcsncpy.c6
-rw-r--r--lib/libc/string/wcspbrk.c6
-rw-r--r--lib/libc/string/wcsrchr.c6
-rw-r--r--lib/libc/string/wcsspn.c6
-rw-r--r--lib/libc/string/wcsstr.c6
-rw-r--r--lib/libc/string/wcstok.c6
-rw-r--r--lib/libc/string/wcswidth.c6
-rw-r--r--lib/libc/string/wmemchr.c6
-rw-r--r--lib/libc/string/wmemcmp.c6
-rw-r--r--lib/libc/string/wmemcpy.c6
-rw-r--r--lib/libc/string/wmemmove.c6
-rw-r--r--lib/libc/string/wmemset.c6
-rw-r--r--lib/libc/sys/ftruncate.c5
-rw-r--r--lib/libc/sys/lseek.c5
-rw-r--r--lib/libc/sys/mmap.c5
-rw-r--r--lib/libc/sys/pread.c6
-rw-r--r--lib/libc/sys/preadv.c6
-rw-r--r--lib/libc/sys/pwrite.c6
-rw-r--r--lib/libc/sys/pwritev.c6
-rw-r--r--lib/libc/sys/semctl.c5
-rw-r--r--lib/libc/sys/stack_protector.c6
-rw-r--r--lib/libc/sys/timer_create.c4
-rw-r--r--lib/libc/sys/timer_delete.c4
-rw-r--r--lib/libc/sys/timer_getoverrun.c4
-rw-r--r--lib/libc/sys/timer_gettime.c4
-rw-r--r--lib/libc/sys/timer_settime.c4
-rw-r--r--lib/libc/sys/truncate.c5
-rw-r--r--lib/libc/time/asctime.c6
-rw-r--r--lib/libc/time/difftime.c6
-rw-r--r--lib/libc/time/ialloc.c6
-rw-r--r--lib/libc/time/localtime.c6
-rw-r--r--lib/libc/time/scheck.c6
-rw-r--r--lib/libc/time/strftime.c6
-rw-r--r--lib/libc/time/strptime.c5
-rw-r--r--lib/libc/time/zdump.c6
-rw-r--r--lib/libc/time/zic.c6
409 files changed, 400 insertions, 2158 deletions
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index 80cad45c6c5..2e336eb6685 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: creat.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: creat.c,v 1.5 2003/06/02 20:18:33 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <fcntl.h>
int
diff --git a/lib/libc/compat-43/getdtablesize.c b/lib/libc/compat-43/getdtablesize.c
index 53207b750b3..43b45a7051e 100644
--- a/lib/libc/compat-43/getdtablesize.c
+++ b/lib/libc/compat-43/getdtablesize.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: getdtablesize.c,v 1.4 2005/08/08 08:05:33 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getdtablesize.c,v 1.3 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <unistd.h>
int
diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c
index 079ca83c161..06610658d9d 100644
--- a/lib/libc/compat-43/gethostid.c
+++ b/lib/libc/compat-43/gethostid.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: gethostid.c,v 1.7 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: gethostid.c,v 1.6 2003/07/15 02:56:14 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <unistd.h>
diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
index 7cf27e77e60..d62603ee7c0 100644
--- a/lib/libc/compat-43/getwd.c
+++ b/lib/libc/compat-43/getwd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getwd.c,v 1.9 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getwd.c,v 1.8 2003/10/10 07:52:58 miod Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <unistd.h>
#include <errno.h>
diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c
index 1deb9ab64a8..75b1ad98a8d 100644
--- a/lib/libc/compat-43/killpg.c
+++ b/lib/libc/compat-43/killpg.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: killpg.c,v 1.5 2003/06/02 20:18:33 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <signal.h>
#include <errno.h>
diff --git a/lib/libc/compat-43/sethostid.c b/lib/libc/compat-43/sethostid.c
index 84634322bfd..4392e042af3 100644
--- a/lib/libc/compat-43/sethostid.c
+++ b/lib/libc/compat-43/sethostid.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sethostid.c,v 1.8 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: sethostid.c,v 1.7 2003/07/15 17:32:42 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <unistd.h>
diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c
index 543a8a08f4e..5a644044d5f 100644
--- a/lib/libc/compat-43/setpgrp.c
+++ b/lib/libc/compat-43/setpgrp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setpgrp.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setpgrp.c,v 1.5 2003/06/02 20:18:33 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index 30c1893ee48..aa31ca294a2 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: sigcompat.c,v 1.4 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <signal.h>
diff --git a/lib/libc/crypt/crypt.c b/lib/libc/crypt/crypt.c
index f0e2900f6d3..15a784532d3 100644
--- a/lib/libc/crypt/crypt.c
+++ b/lib/libc/crypt/crypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypt.c,v 1.19 2004/09/14 22:56:57 deraadt Exp $ */
+/* $OpenBSD: crypt.c,v 1.20 2005/08/08 08:05:33 espie Exp $ */
/*
* FreeSec: libcrypt
@@ -46,10 +46,6 @@
* posted to the sci.crypt newsgroup by the author and is available for FTP.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crypt.c,v 1.19 2004/09/14 22:56:57 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <pwd.h>
diff --git a/lib/libc/crypt/crypt2.c b/lib/libc/crypt/crypt2.c
index 53b5bfb7067..63a297e510d 100644
--- a/lib/libc/crypt/crypt2.c
+++ b/lib/libc/crypt/crypt2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypt2.c,v 1.2 2004/09/14 22:56:57 deraadt Exp $ */
+/* $OpenBSD: crypt2.c,v 1.3 2005/08/08 08:05:33 espie Exp $ */
/*
* FreeSec: libcrypt
@@ -46,10 +46,6 @@
* posted to the sci.crypt newsgroup by the author and is available for FTP.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crypt2.c,v 1.2 2004/09/14 22:56:57 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <pwd.h>
diff --git a/lib/libc/crypt/md5crypt.c b/lib/libc/crypt/md5crypt.c
index 97717e68d54..fe1393cf7c8 100644
--- a/lib/libc/crypt/md5crypt.c
+++ b/lib/libc/crypt/md5crypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5crypt.c,v 1.13 2003/08/07 00:30:21 deraadt Exp $ */
+/* $OpenBSD: md5crypt.c,v 1.14 2005/08/08 08:05:33 espie Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -12,10 +12,6 @@
*
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.13 2003/08/07 00:30:21 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <unistd.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c
index 388b68cd133..e3d740aa7e4 100644
--- a/lib/libc/db/btree/bt_debug.c
+++ b/lib/libc/db/btree/bt_debug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bt_debug.c,v 1.8 2005/03/23 19:34:58 otto Exp $ */
+/* $OpenBSD: bt_debug.c,v 1.9 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_debug.c,v 1.8 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <stdio.h>
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
index 0acb4444001..58f2cf040a8 100644
--- a/lib/libc/db/hash/ndbm.c
+++ b/lib/libc/db/hash/ndbm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ndbm.c,v 1.20 2004/09/15 00:26:07 deraadt Exp $ */
+/* $OpenBSD: ndbm.c,v 1.21 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)dbm.c 8.6 (Berkeley) 11/7/95";
-#else
-static const char rcsid[] = "$OpenBSD: ndbm.c,v 1.20 2004/09/15 00:26:07 deraadt Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <errno.h>
diff --git a/lib/libc/gen/_sys_errlist.c b/lib/libc/gen/_sys_errlist.c
index 37011c992d1..491fd6be9f2 100644
--- a/lib/libc/gen/_sys_errlist.c
+++ b/lib/libc/gen/_sys_errlist.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: _sys_errlist.c,v 1.3 2005/08/08 08:05:33 espie Exp $ */
/*
* Written by J.T. Conklin, December 12, 1994
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _sys_errlist.c,v 1.2 1996/08/19 08:21:24 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#ifdef __indr_reference
@@ -16,18 +13,14 @@ __indr_reference(_sys_errlist, __sys_errlist); /* Backwards compat with v.12 */
#undef _sys_errlist
#undef _sys_nerr
-#undef rcsid
#define _sys_errlist sys_errlist
#define _sys_nerr sys_nerr
-#define rcsid _rcsid
#include "errlist.c"
#undef _sys_errlist
#undef _sys_nerr
-#undef rcsid
#define _sys_errlist __sys_errlist
#define _sys_nerr __sys_nerr
-#define rcsid __rcsid
#include "errlist.c"
#endif
diff --git a/lib/libc/gen/_sys_nerr.c b/lib/libc/gen/_sys_nerr.c
index 24b9da928ce..fac273f8570 100644
--- a/lib/libc/gen/_sys_nerr.c
+++ b/lib/libc/gen/_sys_nerr.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: _sys_nerr.c,v 1.3 2005/08/08 08:05:33 espie Exp $ */
/*
* Written by J.T. Conklin, December 12, 1994
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _sys_nerr.c,v 1.2 1996/08/19 08:21:25 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#ifdef __indr_reference
diff --git a/lib/libc/gen/_sys_siglist.c b/lib/libc/gen/_sys_siglist.c
index 063571d9737..2005c32908d 100644
--- a/lib/libc/gen/_sys_siglist.c
+++ b/lib/libc/gen/_sys_siglist.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: _sys_siglist.c,v 1.3 2005/08/08 08:05:33 espie Exp $ */
/*
* Written by J.T. Conklin, December 12, 1994
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _sys_siglist.c,v 1.2 1996/08/19 08:21:27 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#ifdef __indr_reference
@@ -15,15 +12,11 @@ __indr_reference(_sys_siglist, __sys_siglist); /* Backwards compat with v.12 */
#else
#undef _sys_siglist
-#undef rcsid
#define _sys_siglist sys_siglist
-#define rcsid _rcsid
#include "siglist.c"
#undef _sys_siglist
-#undef rcsid
#define _sys_siglist __sys_siglist
-#define rcsid __rcsid
#include "siglist.c"
#endif
diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
index 98cdaa2e592..2af847a46a3 100644
--- a/lib/libc/gen/alarm.c
+++ b/lib/libc/gen/alarm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: alarm.c,v 1.7 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: alarm.c,v 1.6 2005/03/25 15:38:46 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Backwards compatible alarm.
*/
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
index fe48bc68535..816b050cfaf 100644
--- a/lib/libc/gen/assert.c
+++ b/lib/libc/gen/assert.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: assert.c,v 1.8 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: assert.c,v 1.7 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <assert.h>
#include <stdio.h>
diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
index cae56237afd..d5a915e3d25 100644
--- a/lib/libc/gen/basename.c
+++ b/lib/libc/gen/basename.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: basename.c,v 1.13 2005/03/02 12:27:26 millert Exp $ */
+/* $OpenBSD: basename.c,v 1.14 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: basename.c,v 1.13 2005/03/02 12:27:26 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <libgen.h>
#include <string.h>
diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c
index 58e5b48523a..9279457a29a 100644
--- a/lib/libc/gen/clock.c
+++ b/lib/libc/gen/clock.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clock.c,v 1.5 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: clock.c,v 1.4 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
index c84b43dd10d..f43d5adfbd8 100644
--- a/lib/libc/gen/closedir.c
+++ b/lib/libc/gen/closedir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: closedir.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: closedir.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <dirent.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c
index 0931d1a7f29..7a3c1755a18 100644
--- a/lib/libc/gen/confstr.c
+++ b/lib/libc/gen/confstr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: confstr.c,v 1.7 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: confstr.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
index 31eb63e6c4b..4206dd0c6b4 100644
--- a/lib/libc/gen/ctermid.c
+++ b/lib/libc/gen/ctermid.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ctermid.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ctermid.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <paths.h>
#include <string.h>
diff --git a/lib/libc/gen/ctype_.c b/lib/libc/gen/ctype_.c
index 7f7c0adb3c8..43b6ca6b043 100644
--- a/lib/libc/gen/ctype_.c
+++ b/lib/libc/gen/ctype_.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ctype_.c,v 1.9 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -32,10 +33,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ctype_.c,v 1.8 2005/08/08 05:53:00 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include "ctype_private.h"
diff --git a/lib/libc/gen/daemon.c b/lib/libc/gen/daemon.c
index 87af2fc9fa2..e1dc98e10b2 100644
--- a/lib/libc/gen/daemon.c
+++ b/lib/libc/gen/daemon.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: daemon.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: daemon.c,v 1.5 2003/07/15 17:32:41 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <fcntl.h>
#include <paths.h>
#include <unistd.h>
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index 88c48841c22..6c2e08e18b8 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: devname.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: devname.c,v 1.5 2003/07/15 17:32:41 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <db.h>
diff --git a/lib/libc/gen/dirname.c b/lib/libc/gen/dirname.c
index bcac0824e6e..11007ee0df6 100644
--- a/lib/libc/gen/dirname.c
+++ b/lib/libc/gen/dirname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dirname.c,v 1.12 2005/03/02 12:27:26 millert Exp $ */
+/* $OpenBSD: dirname.c,v 1.13 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: dirname.c,v 1.12 2005/03/02 12:27:26 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <libgen.h>
#include <string.h>
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 500f7ef1c93..818b482d4f3 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: disklabel.c,v 1.10 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#define DKTYPENAMES
#include <sys/disklabel.h>
diff --git a/lib/libc/gen/elf_hash.c b/lib/libc/gen/elf_hash.c
index 18a3e1d33d2..5feb9c58a2e 100644
--- a/lib/libc/gen/elf_hash.c
+++ b/lib/libc/gen/elf_hash.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: elf_hash.c,v 1.8 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1995, 1996 Erik Theisen
* All rights reserved.
@@ -25,10 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: elf_hash.c,v 1.7 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/mman.h>
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 3d02c526840..3ee4bbcdc88 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: err.c,v 1.9 2005/08/08 08:05:33 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: err.c,v 1.8 2003/06/02 20:18:34 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <err.h>
#include <stdarg.h>
diff --git a/lib/libc/gen/errlist.c b/lib/libc/gen/errlist.c
index c803280996f..59117fff59b 100644
--- a/lib/libc/gen/errlist.c
+++ b/lib/libc/gen/errlist.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: errlist.c,v 1.9 2005/08/08 08:05:33 espie Exp $ */
/*
* Copyright (c) 1982, 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: errlist.c,v 1.8 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#ifdef lint
char *
#else
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
index ddbe778702a..62c0978c6aa 100644
--- a/lib/libc/gen/errno.c
+++ b/lib/libc/gen/errno.c
@@ -1,9 +1,6 @@
+/* $OpenBSD: errno.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: errno.c,v 1.4 2004/07/17 20:38:43 marc Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#undef errno
diff --git a/lib/libc/gen/errx.c b/lib/libc/gen/errx.c
index 952b6baaa10..964ff8a3940 100644
--- a/lib/libc/gen/errx.c
+++ b/lib/libc/gen/errx.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: errx.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: errx.c,v 1.7 2003/06/02 20:18:34 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <err.h>
#include <stdarg.h>
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index bf88259177e..08f8153064a 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: exec.c,v 1.18 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: exec.c,v 1.17 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index d41944ad82f..551ba56419e 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fnmatch.c,v 1.11 2004/05/18 02:05:52 jfb Exp $ */
+/* $OpenBSD: fnmatch.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
-#else
-static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.11 2004/05/18 02:05:52 jfb Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
* Compares a filename or pathname to a pattern.
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
index 95c73a32d07..737611a52f9 100644
--- a/lib/libc/gen/frexp.c
+++ b/lib/libc/gen/frexp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: frexp.c,v 1.1 2005/02/01 15:12:28 millert Exp $ */
+/* $OpenBSD: frexp.c,v 1.2 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
@@ -28,10 +28,6 @@
* $FreeBSD: frexp.c,v 1.1 2004/07/18 21:23:39 das Exp $
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: frexp.c,v 1.1 2005/02/01 15:12:28 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <machine/ieee.h>
#include <math.h>
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 3acb1e7e6e9..731068c17b1 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fstab.c,v 1.15 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fstab.c,v 1.14 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index a1feadad03e..f9d6621283c 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ftok.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
@@ -25,10 +26,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ftok.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ipc.h>
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index be94a04faaa..5b8b60957db 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fts.c,v 1.36 2005/06/17 20:36:55 millert Exp $ */
+/* $OpenBSD: fts.c,v 1.37 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
-#else
-static char rcsid[] = "$OpenBSD: fts.c,v 1.36 2005/06/17 20:36:55 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/ftw.c b/lib/libc/gen/ftw.c
index e6bc09c2f11..b25ea2d719a 100644
--- a/lib/libc/gen/ftw.c
+++ b/lib/libc/gen/ftw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftw.c,v 1.4 2004/07/07 16:05:23 millert Exp $ */
+/* $OpenBSD: ftw.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 2003, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: ftw.c,v 1.4 2004/07/07 16:05:23 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
index e7fbff9bbab..0e23ed3c91d 100644
--- a/lib/libc/gen/getbsize.c
+++ b/lib/libc/gen/getbsize.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getbsize.c,v 1.10 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getbsize.c,v 1.9 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index 38b5172a1d8..65d0696ca1d 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getcap.c,v 1.23 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: getcap.c,v 1.22 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 5b9d5c6a609..d0d3446578c 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getcwd.c,v 1.14 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getcwd.c,v 1.13 2005/06/01 18:55:59 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index d5ef087abc8..ce8c1aaef82 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getdomainname.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getdomainname.c,v 1.6 2003/07/15 17:32:41 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <unistd.h>
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 82b75126bf0..fc9036ce599 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getgrent.c,v 1.23 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getgrent.c,v 1.22 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <stdio.h>
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index d70acb783ec..800364c1a31 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.11 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* get credential
*/
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
index 1a8015b52d7..4b01b8bb79c 100644
--- a/lib/libc/gen/gethostname.c
+++ b/lib/libc/gen/gethostname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: gethostname.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gethostname.c,v 1.6 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <unistd.h>
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
index 6dfad0310b6..0b38042fec7 100644
--- a/lib/libc/gen/getloadavg.c
+++ b/lib/libc/gen/getloadavg.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getloadavg.c,v 1.6 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getloadavg.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index 7810dc8aad3..e6a0c285b43 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getlogin.c,v 1.10 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getlogin.c,v 1.9 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <pwd.h>
#include <utmp.h>
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index 746b4835439..323c4cb2db3 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getmntinfo.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getmntinfo.c,v 1.6 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index dc074fae3f9..cc59ae228b6 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getnetgrent.c,v 1.16 2005/08/06 17:03:56 deraadt Exp $ */
+/* $OpenBSD: getnetgrent.c,v 1.17 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.16 2005/08/06 17:03:56 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <stdio.h>
#define _NETGROUP_PRIVATE
diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c
index c8cecbc1a8f..2d01336e07b 100644
--- a/lib/libc/gen/getpagesize.c
+++ b/lib/libc/gen/getpagesize.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getpagesize.c,v 1.6 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getpagesize.c,v 1.5 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <unistd.h>
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 103b08fcdda..5a2e9b1d8ed 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getpwent.c,v 1.34 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getpwent.c,v 1.33 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <fcntl.h>
#include <db.h>
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index 13f61fc06da..38b57feee91 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getttyent.c,v 1.9 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getttyent.c,v 1.8 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ttyent.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index 108a4cc13dc..200c78c66bc 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getusershell.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getusershell.c,v 1.7 2005/04/02 17:04:52 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index e38336496c2..e554b7cba98 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: glob.c,v 1.25 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,14 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
-#else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.24 2004/10/07 16:34:04 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* glob(3) -- a superset of the one defined in POSIX 1003.2.
*
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index 07bad81eb64..c7a717a1410 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: initgroups.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: initgroups.c,v 1.7 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <err.h>
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
index 305fe83b48d..a4c34d8b5c3 100644
--- a/lib/libc/gen/isatty.c
+++ b/lib/libc/gen/isatty.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: isatty.c,v 1.6 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: isatty.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <termios.h>
#include <unistd.h>
#include "thread_private.h"
diff --git a/lib/libc/gen/isctype.c b/lib/libc/gen/isctype.c
index 74a284ad0a6..970b5e274cd 100644
--- a/lib/libc/gen/isctype.c
+++ b/lib/libc/gen/isctype.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: isctype.c,v 1.11 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -32,10 +33,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: isctype.c,v 1.10 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#define _ANSI_LIBRARY
#include <ctype.h>
#include <stdio.h>
diff --git a/lib/libc/gen/isfdtype.c b/lib/libc/gen/isfdtype.c
index 3682bf19ab6..04cee8d7e67 100644
--- a/lib/libc/gen/isfdtype.c
+++ b/lib/libc/gen/isfdtype.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isfdtype.c,v 1.3 2003/06/17 21:56:23 millert Exp $ */
+/* $OpenBSD: isfdtype.c,v 1.4 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: isfdtype.c,v 1.3 2003/06/17 21:56:23 millert Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
index 2da2d867e68..cf0250b0207 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libc/gen/lockf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lockf.c,v 1.3 2003/06/11 21:03:10 deraadt Exp $ */
+/* $OpenBSD: lockf.c,v 1.4 2005/08/08 08:05:34 espie Exp $ */
/* $NetBSD: lockf.c,v 1.1 1997/12/20 20:23:18 kleink Exp $ */
/*-
@@ -37,10 +37,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lockf.c,v 1.3 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/lib/libc/gen/nftw.c b/lib/libc/gen/nftw.c
index 9012c7dbdf9..dd201b495e2 100644
--- a/lib/libc/gen/nftw.c
+++ b/lib/libc/gen/nftw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nftw.c,v 1.4 2004/07/07 16:05:23 millert Exp $ */
+/* $OpenBSD: nftw.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 2003, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: nftw.c,v 1.4 2004/07/07 16:05:23 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
index d1352a8216a..8cbca8cc2f0 100644
--- a/lib/libc/gen/nice.c
+++ b/lib/libc/gen/nice.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: nice.c,v 1.6 2003/06/02 20:18:34 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 3b9d8b74cf1..36493ce6c0d 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: nlist.c,v 1.51 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.50 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/mman.h>
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index fb8f4fc600c..00d2cb75746 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: opendir.c,v 1.14 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: opendir.c,v 1.13 2005/06/16 03:01:25 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
index 4db649bb4b0..b72d966d46a 100644
--- a/lib/libc/gen/pause.c
+++ b/lib/libc/gen/pause.c
@@ -1,14 +1,10 @@
-/* $OpenBSD: pause.c,v 1.5 2004/05/18 02:05:52 jfb Exp $ */
+/* $OpenBSD: pause.c,v 1.6 2005/08/08 08:05:34 espie Exp $ */
/*
* Written by Todd C. Miller <Todd.Miller@courtesan.com>
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: pause.c,v 1.5 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <signal.h>
#include <unistd.h>
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 7b8f6fdc788..5f796e5cee5 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: popen.c,v 1.17 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: popen.c,v 1.16 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/wait.h>
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index 3e2e6ce43a2..e1faa71586b 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: psignal.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: psignal.c,v 1.7 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Print the name of the signal indicated
* along with the supplied message.
diff --git a/lib/libc/gen/pw_dup.c b/lib/libc/gen/pw_dup.c
index e212ff9c258..da7b6b034dd 100644
--- a/lib/libc/gen/pw_dup.c
+++ b/lib/libc/gen/pw_dup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pw_dup.c,v 1.6 2005/02/27 22:13:10 pat Exp $ */
+/* $OpenBSD: pw_dup.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: pw_dup.c,v 1.6 2005/02/27 22:13:10 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <pwd.h>
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index 1d1d3eb2fc6..6f8e6447e99 100644
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pwcache.c,v 1.9 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: pwcache.c,v 1.8 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <grp.h>
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
index d62c212ec25..3ca6d3dfac6 100644
--- a/lib/libc/gen/raise.c
+++ b/lib/libc/gen/raise.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: raise.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: raise.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <signal.h>
#include <unistd.h>
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index 73859cc3633..180ca35fe21 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: readdir.c,v 1.10 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: readdir.c,v 1.9 2005/06/16 03:01:25 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <dirent.h>
#include <string.h>
diff --git a/lib/libc/gen/readpassphrase.c b/lib/libc/gen/readpassphrase.c
index ece1423d509..8e6dde432c4 100644
--- a/lib/libc/gen/readpassphrase.c
+++ b/lib/libc/gen/readpassphrase.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpassphrase.c,v 1.17 2005/05/24 16:09:33 millert Exp $ */
+/* $OpenBSD: readpassphrase.c,v 1.18 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 2000-2002 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.17 2005/05/24 16:09:33 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index fd53a4fa8d4..8d37fa8e6e1 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rewinddir.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rewinddir.c,v 1.6 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <dirent.h>
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index adbf04ce053..f3b3fe2b569 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: scandir.c,v 1.10 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: scandir.c,v 1.9 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Scan the directory dirname calling select to make a list of selected
* directory entries then sort using qsort and compare routine dcomp.
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index 401bf72b8af..b339a2709ad 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: seekdir.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: seekdir.c,v 1.6 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <dirent.h>
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index 330cf63ce2c..0261397fe11 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setdomainname.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setdomainname.c,v 1.7 2003/07/15 17:32:41 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <unistd.h>
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
index 46b2309ed50..90ee4a2ef77 100644
--- a/lib/libc/gen/sethostname.c
+++ b/lib/libc/gen/sethostname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sethostname.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sethostname.c,v 1.7 2003/07/15 17:32:41 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <unistd.h>
diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c
index cca5a3529e7..9a06cdc5f65 100644
--- a/lib/libc/gen/setjmperr.c
+++ b/lib/libc/gen/setjmperr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setjmperr.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setjmperr.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* This routine is called from longjmp() when an error occurs.
* Programs that wish to exit gracefully from this error may
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index e530f09040d..22353badbde 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setmode.c,v 1.16 2005/03/01 13:51:47 miod Exp $ */
+/* $OpenBSD: setmode.c,v 1.17 2005/08/08 08:05:34 espie Exp $ */
/* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94";
-#else
-static char rcsid[] = "$OpenBSD: setmode.c,v 1.16 2005/03/01 13:51:47 miod Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
index 21eddd13084..569c9c146c8 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setproctitle.c,v 1.11 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1994, 1995 Christopher G. Demetriou
* All rights reserved.
@@ -29,10 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setproctitle.c,v 1.10 2005/03/08 15:38:46 moritz Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/exec.h>
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
index 8af4350aa56..ac74a7ab6bf 100644
--- a/lib/libc/gen/siginterrupt.c
+++ b/lib/libc/gen/siginterrupt.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: siginterrupt.c,v 1.6 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: siginterrupt.c,v 1.5 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <signal.h>
/*
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index 1fa993518b9..65c32c08b0d 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: siglist.c,v 1.4 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: siglist.c,v 1.3 2003/06/02 20:18:35 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <signal.h>
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
index d557adceea3..efce8093d0e 100644
--- a/lib/libc/gen/signal.c
+++ b/lib/libc/gen/signal.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: signal.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: signal.c,v 1.6 2004/05/03 17:25:00 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Almost backwards compatible signal.
*/
diff --git a/lib/libc/gen/signame.c b/lib/libc/gen/signame.c
index 5535b9a1965..51f80e3d4ed 100644
--- a/lib/libc/gen/signame.c
+++ b/lib/libc/gen/signame.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: signame.c,v 1.4 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: signame.c,v 1.3 2003/06/02 20:18:35 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <signal.h>
#include <unistd.h>
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index e88c57d01fb..d9b35b5c62b 100644
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sigsetops.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -29,10 +30,6 @@
* @(#)sigsetops.c 8.1 (Berkeley) 6/4/93
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sigsetops.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <signal.h>
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index 88717fdc189..28e9657a9ee 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sleep.c,v 1.11 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sleep.c,v 1.10 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/time.h>
#include <unistd.h>
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c
index af76b7efd89..9eba0f4517d 100644
--- a/lib/libc/gen/strtofflags.c
+++ b/lib/libc/gen/strtofflags.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strtofflags.c,v 1.4 2004/05/18 02:05:52 jfb Exp $ */
+/* $OpenBSD: strtofflags.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)stat_flags.c 8.1 (Berkeley) 5/31/93";
-static const char rcsid[] =
- "$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.18 2000/06/17 11:09:24 joe Exp $";
-#else
-static const char rcsid[] =
- "$OpenBSD: strtofflags.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index f8b3f63697a..16dbc8c6673 100644
--- a/lib/libc/gen/sysconf.c
+++ b/lib/libc/gen/sysconf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sysconf.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sysconf.c,v 1.7 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sem.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index dbba85999fa..386317cc6ec 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sysctl.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sysctl.c,v 1.6 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index fdd10b76b9d..6bba3930e91 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: syslog.c,v 1.28 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: syslog.c,v 1.27 2005/03/08 15:41:03 moritz Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/syslog.h>
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index 3033dede5ff..e215c847c25 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: telldir.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: telldir.c,v 1.6 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <dirent.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
index 6daa35d9ed7..3a57500d433 100644
--- a/lib/libc/gen/time.c
+++ b/lib/libc/gen/time.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: time.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: time.c,v 1.4 2003/07/08 00:11:50 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index 0117263d496..86cf53eca0b 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: times.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: times.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/times.h>
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
index 9bae62c871f..96890723600 100644
--- a/lib/libc/gen/timezone.c
+++ b/lib/libc/gen/timezone.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: timezone.c,v 1.10 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timezone.c,v 1.9 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <stdio.h>
diff --git a/lib/libc/gen/tolower_.c b/lib/libc/gen/tolower_.c
index cd98f88af73..50dcc7b4c86 100644
--- a/lib/libc/gen/tolower_.c
+++ b/lib/libc/gen/tolower_.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: tolower_.c,v 1.9 2005/08/08 08:05:34 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tolower_.c,v 1.8 2005/08/08 05:53:00 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#define _ANSI_LIBRARY
#include <ctype.h>
#include <stdio.h>
diff --git a/lib/libc/gen/toupper_.c b/lib/libc/gen/toupper_.c
index fdb87bc3a29..ac228a7453f 100644
--- a/lib/libc/gen/toupper_.c
+++ b/lib/libc/gen/toupper_.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: toupper_.c,v 1.9 2005/08/08 08:05:34 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: toupper_.c,v 1.8 2005/08/08 05:53:00 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#define _ANSI_LIBRARY
#include <ctype.h>
#include <stdio.h>
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index 16382e8c6f9..7a70cca95fa 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttyname.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ttyname.c,v 1.11 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
index cc524d64b00..da56e911fb1 100644
--- a/lib/libc/gen/ttyslot.c
+++ b/lib/libc/gen/ttyslot.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttyslot.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ttyslot.c,v 1.6 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ttyent.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
index 3afbbe7c740..8c19589dd32 100644
--- a/lib/libc/gen/ualarm.c
+++ b/lib/libc/gen/ualarm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ualarm.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ualarm.c,v 1.6 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index caabf758fe7..f55a468602d 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: uname.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: uname.c,v 1.7 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/utsname.h>
diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c
index 3d68b431a1d..258c2d51996 100644
--- a/lib/libc/gen/unvis.c
+++ b/lib/libc/gen/unvis.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: unvis.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: unvis.c,v 1.11 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <ctype.h>
#include <vis.h>
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index 47890b0c738..5e2c51464ea 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: usleep.c,v 1.10 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: usleep.c,v 1.9 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index 7ad66e0112f..263c217a01b 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: utime.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: utime.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/time.h>
#include <utime.h>
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
index 0252c8f4829..42d8eec4bd0 100644
--- a/lib/libc/gen/valloc.c
+++ b/lib/libc/gen/valloc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: valloc.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: valloc.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/gen/verr.c b/lib/libc/gen/verr.c
index 8d63a16a13a..fdf07ed0b58 100644
--- a/lib/libc/gen/verr.c
+++ b/lib/libc/gen/verr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: verr.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: verr.c,v 1.7 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <err.h>
#include <errno.h>
diff --git a/lib/libc/gen/verrx.c b/lib/libc/gen/verrx.c
index 6652a497560..9e3cf54e4a7 100644
--- a/lib/libc/gen/verrx.c
+++ b/lib/libc/gen/verrx.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: verrx.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: verrx.c,v 1.7 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <err.h>
#include <stdio.h>
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
index 2a5c90143db..bbe839e9a7a 100644
--- a/lib/libc/gen/vis.c
+++ b/lib/libc/gen/vis.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vis.c,v 1.15 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vis.c,v 1.14 2005/03/25 15:38:47 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <limits.h>
#include <ctype.h>
diff --git a/lib/libc/gen/vwarn.c b/lib/libc/gen/vwarn.c
index e59b53da74a..41ab3698727 100644
--- a/lib/libc/gen/vwarn.c
+++ b/lib/libc/gen/vwarn.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vwarn.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vwarn.c,v 1.7 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <err.h>
#include <errno.h>
diff --git a/lib/libc/gen/vwarnx.c b/lib/libc/gen/vwarnx.c
index 75fbeeaf2cf..41fda8e901a 100644
--- a/lib/libc/gen/vwarnx.c
+++ b/lib/libc/gen/vwarnx.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vwarnx.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vwarnx.c,v 1.7 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <err.h>
#include <stdio.h>
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index ef7bf7ec2a8..30c1b591a9a 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wait.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: wait.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
index 2fae3cd1bfc..5eb263b7f10 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libc/gen/wait3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wait3.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: wait3.c,v 1.4 2004/05/18 02:05:52 jfb Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index 4ac4040ecf2..078a6db38d9 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: waitpid.c,v 1.6 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: waitpid.c,v 1.5 2003/06/02 20:18:35 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/lib/libc/gen/warn.c b/lib/libc/gen/warn.c
index 1cceb504461..bbff436f59b 100644
--- a/lib/libc/gen/warn.c
+++ b/lib/libc/gen/warn.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: warn.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: warn.c,v 1.7 2003/06/02 20:18:35 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <err.h>
#include <stdarg.h>
diff --git a/lib/libc/gen/warnx.c b/lib/libc/gen/warnx.c
index 7c357f67bb5..42a15778c68 100644
--- a/lib/libc/gen/warnx.c
+++ b/lib/libc/gen/warnx.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: warnx.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: warnx.c,v 1.6 2003/06/02 20:18:35 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <err.h>
#include <stdarg.h>
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index 81f5e761670..a5001c48d98 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: gmon.c,v 1.19 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if !defined(lint) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: gmon.c,v 1.18 2005/04/21 00:09:01 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/gmon.h>
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index dcdb621ab6a..b977759b00e 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mcount.c,v 1.10 2005/08/08 08:05:34 espie Exp $ */
/*-
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: mcount.c,v 1.9 2005/03/23 19:32:09 otto Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/gmon.h>
diff --git a/lib/libc/hash/helper.c b/lib/libc/hash/helper.c
index bf3a6c243c5..a4a2255127c 100644
--- a/lib/libc/hash/helper.c
+++ b/lib/libc/hash/helper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: helper.c,v 1.7 2004/09/16 15:12:09 millert Exp $ */
+/* $OpenBSD: helper.c,v 1.8 2005/08/08 08:05:35 espie Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -9,10 +9,6 @@
* ----------------------------------------------------------------------------
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: helper.c,v 1.7 2004/09/16 15:12:09 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/hash/md4.c b/lib/libc/hash/md4.c
index 0979ae348a5..a59ca7c2e9b 100644
--- a/lib/libc/hash/md4.c
+++ b/lib/libc/hash/md4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md4.c,v 1.6 2004/05/28 15:10:27 millert Exp $ */
+/* $OpenBSD: md4.c,v 1.7 2005/08/08 08:05:35 espie Exp $ */
/*
* This code implements the MD4 message-digest algorithm.
@@ -18,10 +18,6 @@
* will fill a supplied 16-byte array with the digest.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: md4.c,v 1.6 2004/05/28 15:10:27 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <string.h>
#include <md4.h>
diff --git a/lib/libc/hash/md5.c b/lib/libc/hash/md5.c
index a1ff135e3cf..e60bbd904de 100644
--- a/lib/libc/hash/md5.c
+++ b/lib/libc/hash/md5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5.c,v 1.7 2004/05/28 15:10:27 millert Exp $ */
+/* $OpenBSD: md5.c,v 1.8 2005/08/08 08:05:35 espie Exp $ */
/*
* This code implements the MD5 message-digest algorithm.
@@ -17,10 +17,6 @@
* will fill a supplied 16-byte array with the digest.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: md5.c,v 1.7 2004/05/28 15:10:27 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <string.h>
#include <md5.h>
diff --git a/lib/libc/hash/rmd160.c b/lib/libc/hash/rmd160.c
index 4fb64cd19aa..a2e8debb216 100644
--- a/lib/libc/hash/rmd160.c
+++ b/lib/libc/hash/rmd160.c
@@ -31,10 +31,6 @@
#include <sys/endian.h>
#include <rmd160.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rmd160.c,v 1.17 2004/05/28 15:10:27 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#define PUT_64BIT_LE(cp, value) do { \
(cp)[7] = (value) >> 56; \
(cp)[6] = (value) >> 48; \
diff --git a/lib/libc/hash/sha1.c b/lib/libc/hash/sha1.c
index 968c2b322f8..f5851502620 100644
--- a/lib/libc/hash/sha1.c
+++ b/lib/libc/hash/sha1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha1.c,v 1.19 2004/05/28 15:10:27 millert Exp $ */
+/* $OpenBSD: sha1.c,v 1.20 2005/08/08 08:05:35 espie Exp $ */
/*
* SHA-1 in C
@@ -14,10 +14,6 @@
* 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: sha1.c,v 1.19 2004/05/28 15:10:27 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <string.h>
#include <sha1.h>
diff --git a/lib/libc/hash/sha2.c b/lib/libc/hash/sha2.c
index c99ed4d6a02..fd97de0e93b 100644
--- a/lib/libc/hash/sha2.c
+++ b/lib/libc/hash/sha2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha2.c,v 1.10 2004/05/28 15:10:27 millert Exp $ */
+/* $OpenBSD: sha2.c,v 1.11 2005/08/08 08:05:35 espie Exp $ */
/*
* FILE: sha2.c
@@ -34,10 +34,6 @@
* $From: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: sha2.c,v 1.10 2004/05/28 15:10:27 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <string.h>
diff --git a/lib/libc/locale/__mb_cur_max.c b/lib/libc/locale/__mb_cur_max.c
index 61c0d2b9c82..ec99fb6b399 100644
--- a/lib/libc/locale/__mb_cur_max.c
+++ b/lib/libc/locale/__mb_cur_max.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: __mb_cur_max.c,v 1.1 2005/05/11 18:44:12 espie Exp $ */
+/* $OpenBSD: __mb_cur_max.c,v 1.2 2005/08/08 08:05:35 espie Exp $ */
/* $NetBSD: __mb_cur_max.c,v 1.2 2001/01/25 01:25:06 itojun Exp $ */
/*-
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: __mb_cur_max.c,v 1.1 2005/05/11 18:44:12 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <limits.h>
diff --git a/lib/libc/locale/_def_messages.c b/lib/libc/locale/_def_messages.c
index 1be99c57779..1ed653a9766 100644
--- a/lib/libc/locale/_def_messages.c
+++ b/lib/libc/locale/_def_messages.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: _def_messages.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _def_messages.c,v 1.4 2001/07/30 22:40:22 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/localedef.h>
#include <locale.h>
diff --git a/lib/libc/locale/_def_monetary.c b/lib/libc/locale/_def_monetary.c
index 653424309a9..aa92c75d111 100644
--- a/lib/libc/locale/_def_monetary.c
+++ b/lib/libc/locale/_def_monetary.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: _def_monetary.c,v 1.4 2005/08/08 08:05:35 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _def_monetary.c,v 1.3 1997/07/23 21:14:38 kstailey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/localedef.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/locale/_def_numeric.c b/lib/libc/locale/_def_numeric.c
index 26320ebd8b0..6511254ac01 100644
--- a/lib/libc/locale/_def_numeric.c
+++ b/lib/libc/locale/_def_numeric.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: _def_numeric.c,v 1.4 2005/08/08 08:05:35 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _def_numeric.c,v 1.3 1997/07/23 21:14:39 kstailey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/localedef.h>
#include <locale.h>
diff --git a/lib/libc/locale/_def_time.c b/lib/libc/locale/_def_time.c
index 99cc4011fce..92da7be1a49 100644
--- a/lib/libc/locale/_def_time.c
+++ b/lib/libc/locale/_def_time.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: _def_time.c,v 1.4 2005/08/08 08:05:35 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _def_time.c,v 1.3 1997/07/23 21:14:40 kstailey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/localedef.h>
#include <locale.h>
diff --git a/lib/libc/locale/iswctype_sb.c b/lib/libc/locale/iswctype_sb.c
deleted file mode 100644
index 1bf75a3cb85..00000000000
--- a/lib/libc/locale/iswctype_sb.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* $OpenBSD: iswctype_sb.c,v 1.3 2005/07/01 08:59:27 espie Exp $ */
-/* $NetBSD: iswctype_sb.c,v 1.3 2003/08/07 16:43:04 agc Exp $ */
-
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: iswctype_sb.c,v 1.3 2005/07/01 08:59:27 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <wchar.h>
-#include <wctype.h>
-#include <ctype.h>
-#include <errno.h>
-#include "runetype.h"
-
-int
-iswalnum(wint_t c)
-{
- return isalnum((int)c);
-}
-
-int
-iswalpha(wint_t c)
-{
- return isalpha((int)c);
-}
-
-int
-iswblank(wint_t c)
-{
- return isblank((int)c);
-}
-
-int
-iswcntrl(wint_t c)
-{
- return iscntrl((int)c);
-}
-
-int
-iswdigit(wint_t c)
-{
- return isdigit((int)c);
-}
-
-int
-iswgraph(wint_t c)
-{
- return isgraph((int)c);
-}
-
-int
-iswlower(wint_t c)
-{
- return islower((int)c);
-}
-
-int
-iswprint(wint_t c)
-{
- return isprint((int)c);
-}
-
-int
-iswpunct(wint_t c)
-{
- return ispunct((int)c);
-}
-
-int
-iswspace(wint_t c)
-{
- return isspace((int)c);
-}
-
-int
-iswupper(wint_t c)
-{
- return isupper((int)c);
-}
-
-int
-iswxdigit(wint_t c)
-{
- return isxdigit((int)c);
-}
-
-wint_t
-towupper(wint_t c)
-{
- return toupper((int)c);
-}
-
-wint_t
-towlower(wint_t c)
-{
- return tolower((int)c);
-}
-
-int
-wcwidth(wint_t c)
-{
- return 1;
-}
-
-static _WCTypeEntry names[] = {
- "alnum", _WCTYPE_INDEX_ALNUM,
- "alpha", _WCTYPE_INDEX_ALPHA,
- "blank", _WCTYPE_INDEX_BLANK,
- "cntrl", _WCTYPE_INDEX_CNTRL,
- "digit", _WCTYPE_INDEX_DIGIT,
- "graph", _WCTYPE_INDEX_GRAPH,
- "lower", _WCTYPE_INDEX_LOWER,
- "print", _WCTYPE_INDEX_PRINT,
- "punct", _WCTYPE_INDEX_PUNCT,
- "space", _WCTYPE_INDEX_SPACE,
- "upper", _WCTYPE_INDEX_UPPER,
- "xdigit", _WCTYPE_INDEX_XDIGIT
-};
-
-static _WCTransEntry tnames[] = {
- "tolower", 0, 0,
- "toupper", 0, 0
-};
-
-
-wctype_t
-wctype(const char *charclass)
-{
- int i;
-
- for (i = 0; i < sizeof names / sizeof names[0]; i++)
- if (strcmp(names[i].te_name, charclass) == 0)
- return (wctype_t)(&names[i]);
- return (wctype_t)NULL;
-}
-
-wctrans_t
-wctrans(const char *charclass)
-{
- int i;
-
- for (i = 0; i < sizeof tnames / sizeof tnames[0]; i++)
- if (strcmp(names[i].te_name, charclass) == 0)
- return (wctrans_t)(&tnames[i]);
- return (wctrans_t)NULL;
-}
-
-int
-iswctype(wint_t c, wctype_t charclass)
-{
- _WCTypeEntry *e = (_WCTypeEntry *)charclass;
- if (e == NULL) {
- return 0;
- }
- switch (e->te_mask) {
- case _WCTYPE_INDEX_ALNUM:
- return iswalnum(c);
- case _WCTYPE_INDEX_ALPHA:
- return iswalpha(c);
- case _WCTYPE_INDEX_BLANK:
- return iswblank(c);
- case _WCTYPE_INDEX_CNTRL:
- return iswcntrl(c);
- case _WCTYPE_INDEX_DIGIT:
- return iswdigit(c);
- case _WCTYPE_INDEX_GRAPH:
- return iswgraph(c);
- case _WCTYPE_INDEX_LOWER:
- return iswlower(c);
- case _WCTYPE_INDEX_PRINT:
- return iswprint(c);
- case _WCTYPE_INDEX_PUNCT:
- return iswpunct(c);
- case _WCTYPE_INDEX_SPACE:
- return iswspace(c);
- case _WCTYPE_INDEX_UPPER:
- return iswupper(c);
- case _WCTYPE_INDEX_XDIGIT:
- return iswxdigit(c);
- default:
- return 0;
- }
-}
-
-wint_t
-towctrans(wint_t c, wctrans_t desc)
-{
- if (desc == (wctrans_t)(&tnames[_WCTRANS_INDEX_LOWER])) {
- return towlower(c);
- } else if (desc == (wctrans_t)(&tnames[_WCTRANS_INDEX_UPPER])) {
- return towupper(c);
- } else {
- errno = EINVAL;
- return (c);
- }
-}
diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
index 2af3897fc99..989eb4bca65 100644
--- a/lib/libc/locale/localeconv.c
+++ b/lib/libc/locale/localeconv.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: localeconv.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: localeconv.c,v 1.4 2005/03/23 21:13:28 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/localedef.h>
#include <locale.h>
diff --git a/lib/libc/locale/mbrtowc_sb.c b/lib/libc/locale/mbrtowc_sb.c
index 3b0039b0755..649ec261e6d 100644
--- a/lib/libc/locale/mbrtowc_sb.c
+++ b/lib/libc/locale/mbrtowc_sb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbrtowc_sb.c,v 1.1 2005/07/24 09:50:49 espie Exp $ */
+/* $OpenBSD: mbrtowc_sb.c,v 1.2 2005/08/08 08:05:35 espie Exp $ */
/* $NetBSD: multibyte_sb.c,v 1.4 2003/08/07 16:43:04 agc Exp $ */
/*
@@ -30,10 +30,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mbrtowc_sb.c,v 1.1 2005/07/24 09:50:49 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdlib.h>
#include <wchar.h>
diff --git a/lib/libc/locale/multibyte_sb.c b/lib/libc/locale/multibyte_sb.c
index 748601526d4..1dd87e8d6d6 100644
--- a/lib/libc/locale/multibyte_sb.c
+++ b/lib/libc/locale/multibyte_sb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: multibyte_sb.c,v 1.3 2005/07/24 09:50:49 espie Exp $ */
+/* $OpenBSD: multibyte_sb.c,v 1.4 2005/08/08 08:05:35 espie Exp $ */
/* $NetBSD: multibyte_sb.c,v 1.4 2003/08/07 16:43:04 agc Exp $ */
/*
@@ -30,10 +30,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: multibyte_sb.c,v 1.3 2005/07/24 09:50:49 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdlib.h>
#include <wchar.h>
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
index f4458a3e583..176d5588351 100644
--- a/lib/libc/locale/nl_langinfo.c
+++ b/lib/libc/locale/nl_langinfo.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: nl_langinfo.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: nl_langinfo.c,v 1.4 2005/03/23 21:13:28 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/localedef.h>
#include <locale.h>
#include <nl_types.h>
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 7453e777764..9587ecca56d 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setlocale.c,v 1.13 2005/08/08 05:53:01 espie Exp $ */
+/* $OpenBSD: setlocale.c,v 1.14 2005/08/08 08:05:35 espie Exp $ */
/*
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setlocale.c,v 1.13 2005/08/08 05:53:01 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/localedef.h>
#include <locale.h>
#include <limits.h>
diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c
index b99506e3aa5..03395a0fe69 100644
--- a/lib/libc/locale/wcstol.c
+++ b/lib/libc/locale/wcstol.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: wcstol.c,v 1.1 2005/07/01 08:59:27 espie Exp $ */
+/* $OpenBSD: wcstol.c,v 1.2 2005/08/08 08:05:35 espie Exp $ */
/* $NetBSD: wcstol.c,v 1.2 2003/03/11 09:21:23 tshiozak Exp $ */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: wcstol.c,v 1.1 2005/07/01 08:59:27 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c
index 1ccafa489f3..926db70f605 100644
--- a/lib/libc/locale/wcstoll.c
+++ b/lib/libc/locale/wcstoll.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: wcstoll.c,v 1.1 2005/07/01 08:59:27 espie Exp $ */
+/* $OpenBSD: wcstoll.c,v 1.2 2005/08/08 08:05:35 espie Exp $ */
/* $NetBSD: wcstoll.c,v 1.1 2003/03/11 09:21:23 tshiozak Exp $ */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: wcstoll.c,v 1.1 2005/07/01 08:59:27 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c
index 6526a3615c6..e863862d3ab 100644
--- a/lib/libc/locale/wcstoul.c
+++ b/lib/libc/locale/wcstoul.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: wcstoul.c,v 1.1 2005/07/01 08:59:27 espie Exp $ */
+/* $OpenBSD: wcstoul.c,v 1.2 2005/08/08 08:05:35 espie Exp $ */
/* $NetBSD: wcstoul.c,v 1.2 2003/03/11 09:21:24 tshiozak Exp $ */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: wcstoul.c,v 1.1 2005/07/01 08:59:27 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c
index 2d4bfbcf3df..6671c375972 100644
--- a/lib/libc/locale/wcstoull.c
+++ b/lib/libc/locale/wcstoull.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: wcstoull.c,v 1.1 2005/07/01 08:59:27 espie Exp $ */
+/* $OpenBSD: wcstoull.c,v 1.2 2005/08/08 08:05:35 espie Exp $ */
/* $NetBSD: wcstoull.c,v 1.1 2003/03/11 09:21:24 tshiozak Exp $ */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: wcstoull.c,v 1.1 2005/07/01 08:59:27 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c
index 394793545f9..34f357899d3 100644
--- a/lib/libc/quad/TESTS/divrem.c
+++ b/lib/libc/quad/TESTS/divrem.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: divrem.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,18 +32,10 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: divrem.c,v 1.4 2004/04/27 17:46:46 otto Exp $";
-#endif /* not lint */
#include <stdio.h>
+int
main()
{
union { long long q; unsigned int v[2]; } a, b, q, r;
diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c
index bd5e562b42e..70905556d7a 100644
--- a/lib/libc/quad/TESTS/mul.c
+++ b/lib/libc/quad/TESTS/mul.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mul.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,18 +32,9 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: mul.c,v 1.4 2004/04/27 17:46:47 otto Exp $";
-#endif /* not lint */
-
#include <stdio.h>
+int
main()
{
union { long long q; unsigned int v[2]; } a, b, m;
diff --git a/lib/libc/quad/adddi3.c b/lib/libc/quad/adddi3.c
index f10689bb8d4..70e236a5d32 100644
--- a/lib/libc/quad/adddi3.c
+++ b/lib/libc/quad/adddi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: adddi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: adddi3.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/anddi3.c b/lib/libc/quad/anddi3.c
index f404051a522..2512ad783d3 100644
--- a/lib/libc/quad/anddi3.c
+++ b/lib/libc/quad/anddi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: anddi3.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: anddi3.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/ashldi3.c b/lib/libc/quad/ashldi3.c
index 09ba618f405..d21f54f87b8 100644
--- a/lib/libc/quad/ashldi3.c
+++ b/lib/libc/quad/ashldi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ashldi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ashldi3.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/ashrdi3.c b/lib/libc/quad/ashrdi3.c
index 6c1b1c1639c..d99643bac5e 100644
--- a/lib/libc/quad/ashrdi3.c
+++ b/lib/libc/quad/ashrdi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ashrdi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ashrdi3.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/cmpdi2.c b/lib/libc/quad/cmpdi2.c
index ade8b22ba5d..5333bc6fe92 100644
--- a/lib/libc/quad/cmpdi2.c
+++ b/lib/libc/quad/cmpdi2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmpdi2.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cmpdi2.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/divdi3.c b/lib/libc/quad/divdi3.c
index 1ae5abd83eb..0c194fcba87 100644
--- a/lib/libc/quad/divdi3.c
+++ b/lib/libc/quad/divdi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: divdi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: divdi3.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c
index c016946216a..861cf354ab6 100644
--- a/lib/libc/quad/fixdfdi.c
+++ b/lib/libc/quad/fixdfdi.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fixdfdi.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fixdfdi.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c
index 502a3d7235b..fb28d469235 100644
--- a/lib/libc/quad/fixsfdi.c
+++ b/lib/libc/quad/fixsfdi.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fixsfdi.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fixsfdi.c,v 1.5 2004/04/27 17:46:46 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c
index 79b11db3995..ed04c130d9a 100644
--- a/lib/libc/quad/fixunsdfdi.c
+++ b/lib/libc/quad/fixunsdfdi.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fixunsdfdi.c,v 1.7 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fixunsdfdi.c,v 1.6 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
#define ONE_FOURTH ((int)1 << (INT_BITS - 2))
diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c
index 6ca9172aab1..359779e0cdc 100644
--- a/lib/libc/quad/fixunssfdi.c
+++ b/lib/libc/quad/fixunssfdi.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fixunssfdi.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fixunssfdi.c,v 1.4 2004/04/27 17:46:46 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
#define ONE_FOURTH ((int)1 << (INT_BITS - 2))
diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c
index 55ef9fab07a..5cdc8393f2c 100644
--- a/lib/libc/quad/floatdidf.c
+++ b/lib/libc/quad/floatdidf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: floatdidf.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: floatdidf.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c
index 24dd148175b..6134787f13d 100644
--- a/lib/libc/quad/floatdisf.c
+++ b/lib/libc/quad/floatdisf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: floatdisf.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: floatdisf.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/floatunsdidf.c b/lib/libc/quad/floatunsdidf.c
index e2f1e99f08a..361b61a2034 100644
--- a/lib/libc/quad/floatunsdidf.c
+++ b/lib/libc/quad/floatunsdidf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: floatunsdidf.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: floatunsdidf.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/iordi3.c b/lib/libc/quad/iordi3.c
index d044ce96e81..62aef5ecbb3 100644
--- a/lib/libc/quad/iordi3.c
+++ b/lib/libc/quad/iordi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: iordi3.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: iordi3.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/lshldi3.c b/lib/libc/quad/lshldi3.c
index 43abdf5d18b..f750044bb9a 100644
--- a/lib/libc/quad/lshldi3.c
+++ b/lib/libc/quad/lshldi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lshldi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lshldi3.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/lshrdi3.c b/lib/libc/quad/lshrdi3.c
index c4fbb8cb047..1dded26d40e 100644
--- a/lib/libc/quad/lshrdi3.c
+++ b/lib/libc/quad/lshrdi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lshrdi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lshrdi3.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/moddi3.c b/lib/libc/quad/moddi3.c
index b9c1db58423..36c49485aed 100644
--- a/lib/libc/quad/moddi3.c
+++ b/lib/libc/quad/moddi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: moddi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: moddi3.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/muldi3.c b/lib/libc/quad/muldi3.c
index d056e40f84a..3cce20fff86 100644
--- a/lib/libc/quad/muldi3.c
+++ b/lib/libc/quad/muldi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: muldi3.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: muldi3.c,v 1.4 2004/04/27 17:46:46 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/negdi2.c b/lib/libc/quad/negdi2.c
index 860cd71bb18..669ce0832fb 100644
--- a/lib/libc/quad/negdi2.c
+++ b/lib/libc/quad/negdi2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: negdi2.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: negdi2.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/notdi2.c b/lib/libc/quad/notdi2.c
index bada11843f7..47f23ab4529 100644
--- a/lib/libc/quad/notdi2.c
+++ b/lib/libc/quad/notdi2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: notdi2.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: notdi2.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
index c52d44aad2a..f8d0c93adbd 100644
--- a/lib/libc/quad/qdivrem.c
+++ b/lib/libc/quad/qdivrem.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: qdivrem.c,v 1.7 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.6 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Multiprecision divide. This algorithm is from Knuth vol. 2 (2nd ed),
* section 4.3.1, pp. 257--259.
diff --git a/lib/libc/quad/subdi3.c b/lib/libc/quad/subdi3.c
index f9d17bff79c..909ef4c708c 100644
--- a/lib/libc/quad/subdi3.c
+++ b/lib/libc/quad/subdi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: subdi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: subdi3.c,v 1.5 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/ucmpdi2.c b/lib/libc/quad/ucmpdi2.c
index 598d9f139a7..2b97460e956 100644
--- a/lib/libc/quad/ucmpdi2.c
+++ b/lib/libc/quad/ucmpdi2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ucmpdi2.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ucmpdi2.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/udivdi3.c b/lib/libc/quad/udivdi3.c
index 0801d6f71eb..b702aab6fb7 100644
--- a/lib/libc/quad/udivdi3.c
+++ b/lib/libc/quad/udivdi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: udivdi3.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: udivdi3.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/umoddi3.c b/lib/libc/quad/umoddi3.c
index 098bb4c340d..1eab2fc5b44 100644
--- a/lib/libc/quad/umoddi3.c
+++ b/lib/libc/quad/umoddi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: umoddi3.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: umoddi3.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/xordi3.c b/lib/libc/quad/xordi3.c
index 603a76a55b5..9619eadd9b6 100644
--- a/lib/libc/quad/xordi3.c
+++ b/lib/libc/quad/xordi3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xordi3.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: xordi3.c,v 1.4 2004/10/17 17:49:21 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 4d7520ea9e5..b542f868542 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth_none.c,v 1.9 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: auth_none.c,v 1.8 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* auth_none.c
* Creates a client authentication handle for passing "null"
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 22bb22d19de..e4044fe18a9 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth_unix.c,v 1.19 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: auth_unix.c,v 1.18 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* auth_unix.c, Implements UNIX style authentication parameters.
*
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index 6a43f127c07..89d920098ed 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: authunix_prot.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: authunix_prot.c,v 1.5 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* authunix_prot.c
* XDR for UNIX style authentication parameters for RPC
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 266861e1d99..7f23799f418 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clnt_generic.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: clnt_generic.c,v 1.4 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Copyright (C) 1987, Sun Microsystems, Inc.
*/
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index a50b4f61f0e..7ecb0fc6e8f 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clnt_perror.c,v 1.18 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: clnt_perror.c,v 1.17 2005/04/11 18:34:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* clnt_perror.c
*
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index 2b467104d4e..04c911b6668 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clnt_raw.c,v 1.14 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: clnt_raw.c,v 1.13 2005/08/01 19:44:53 jmc Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* clnt_raw.c
*
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index e6bb932306f..5773282184c 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -1,4 +1,4 @@
-
+/* $OpenBSD: clnt_simple.c,v 1.12 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -28,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: clnt_simple.c,v 1.11 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* clnt_simple.c
* Simplified front end to rpc.
diff --git a/lib/libc/rpc/clnt_tcp.c b/lib/libc/rpc/clnt_tcp.c
index a5cb329eef4..ec7130d6c5f 100644
--- a/lib/libc/rpc/clnt_tcp.c
+++ b/lib/libc/rpc/clnt_tcp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clnt_tcp.c,v 1.22 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: clnt_tcp.c,v 1.21 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* clnt_tcp.c, Implements a TCP/IP based, client side RPC.
*
diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c
index f1d4814a2cc..ee3367ee06e 100644
--- a/lib/libc/rpc/clnt_udp.c
+++ b/lib/libc/rpc/clnt_udp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clnt_udp.c,v 1.23 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: clnt_udp.c,v 1.22 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* clnt_udp.c, Implements a UDP/IP based, client side RPC.
*
diff --git a/lib/libc/rpc/get_myaddress.c b/lib/libc/rpc/get_myaddress.c
index bc0d7b66f86..b9ff2764558 100644
--- a/lib/libc/rpc/get_myaddress.c
+++ b/lib/libc/rpc/get_myaddress.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: get_myaddress.c,v 1.12 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: get_myaddress.c,v 1.11 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* get_myaddress.c
*
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index cfae27e3fda..444d113a6c6 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getrpcent.c,v 1.13 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -28,10 +29,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getrpcent.c,v 1.12 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Copyright (c) 1984 by Sun Microsystems, Inc.
*/
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 5b96a1d36c3..e56ce259f97 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getrpcport.c,v 1.7 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getrpcport.c,v 1.6 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Copyright (c) 1985 by Sun Microsystems, Inc.
*/
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index e099345a991..f840322ab1f 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pmap_clnt.c,v 1.15 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: pmap_clnt.c,v 1.14 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* pmap_clnt.c
* Client interface to pmap rpc service.
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index 07d3a208819..f9d0354a529 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pmap_getmaps.c,v 1.10 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: pmap_getmaps.c,v 1.9 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* pmap_getmap.c
* Client interface to pmap rpc service.
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index 7fc558082f7..27d027f6017 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pmap_getport.c,v 1.10 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: pmap_getport.c,v 1.9 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* pmap_getport.c
* Client interface to pmap rpc service.
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index 549a7d3048d..9a1d3adc6a4 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pmap_prot.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: pmap_prot.c,v 1.5 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* pmap_prot.c
* Protocol for the local binder service, or pmap.
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index dd6a2aa6059..c00b2b3d880 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pmap_prot2.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: pmap_prot2.c,v 1.5 2005/04/01 07:44:03 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* pmap_prot2.c
* Protocol for the local binder service, or pmap.
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index 08409bb7e5c..17da0c1d543 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pmap_rmt.c,v 1.25 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: pmap_rmt.c,v 1.24 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* pmap_rmt.c
* Client interface to pmap rpc service.
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index 1f8b1bf7111..fd9f528dd62 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_callmsg.c,v 1.9 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rpc_callmsg.c,v 1.8 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* rpc_callmsg.c
*
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
index 87d23b23cd3..3f4b5971942 100644
--- a/lib/libc/rpc/rpc_commondata.c
+++ b/lib/libc/rpc/rpc_commondata.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_commondata.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rpc_commondata.c,v 1.4 2003/12/31 03:27:23 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <rpc/rpc.h>
/*
* This file should only contain common data (global data) that is exported
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index d86661f1e4e..d1a5755de77 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_dtablesize.c,v 1.7 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rpc_dtablesize.c,v 1.6 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <unistd.h>
#include <sys/types.h>
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index ffc17d1e402..3500957e70d 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_prot.c,v 1.10 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rpc_prot.c,v 1.9 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* rpc_prot.c
*
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index c47ed46d7c2..24820521200 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc.c,v 1.20 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc.c,v 1.19 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* svc.c, Server-side remote procedure call interface.
*
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index 67d59a16ed0..f9c3dc086cd 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc_auth.c,v 1.7 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_auth.c,v 1.6 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* svc_auth_nodes.c, Server-side rpc authenticator interface,
* *WITHOUT* DES authentication.
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index 50b84ef68fb..d925c371078 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc_auth_unix.c,v 1.9 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_auth_unix.c,v 1.8 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* svc_auth_unix.c
* Handles UNIX flavor authentication parameters on the service side of rpc.
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index d3f29477a09..76bb8248d7a 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc_raw.c,v 1.9 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_raw.c,v 1.8 2005/08/01 19:44:53 jmc Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* svc_raw.c, This a toy for simple testing and timing.
* Interface to create an rpc client and server in the same UNIX process.
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index 9cdbc1f4f1d..56a7b0d5af7 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc_run.c,v 1.16 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_run.c,v 1.15 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* This is the rpc server side idle loop
* Wait for input, call server program.
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index 86b42175a44..fdd2ade58bd 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc_simple.c,v 1.10 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_simple.c,v 1.9 2005/04/25 08:18:41 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* svc_simple.c
* Simplified front end to rpc.
diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c
index 24b90ba79ab..620606d0e17 100644
--- a/lib/libc/rpc/svc_tcp.c
+++ b/lib/libc/rpc/svc_tcp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc_tcp.c,v 1.26 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_tcp.c,v 1.25 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* svc_tcp.c, Server side for TCP/IP based RPC.
*
diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c
index 1b592c36429..4a9bc8a1a71 100644
--- a/lib/libc/rpc/svc_udp.c
+++ b/lib/libc/rpc/svc_udp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc_udp.c,v 1.16 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_udp.c,v 1.15 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* svc_udp.c,
* Server side for UDP/IP based RPC. (Does some caching in the hopes of
diff --git a/lib/libc/rpc/xdr.c b/lib/libc/rpc/xdr.c
index 1f5aa627bb2..e2569bbf66f 100644
--- a/lib/libc/rpc/xdr.c
+++ b/lib/libc/rpc/xdr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xdr.c,v 1.9 2005/08/08 08:05:35 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr.c,v 1.8 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* xdr.c, Generic XDR routines implementation.
*
diff --git a/lib/libc/rpc/xdr_array.c b/lib/libc/rpc/xdr_array.c
index a7d76e568a5..f66f36576f4 100644
--- a/lib/libc/rpc/xdr_array.c
+++ b/lib/libc/rpc/xdr_array.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xdr_array.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_array.c,v 1.8 2005/08/05 08:39:10 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* xdr_array.c, Generic XDR routines implementation.
*
diff --git a/lib/libc/rpc/xdr_float.c b/lib/libc/rpc/xdr_float.c
index ab68be6a1eb..40187f7118a 100644
--- a/lib/libc/rpc/xdr_float.c
+++ b/lib/libc/rpc/xdr_float.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xdr_float.c,v 1.15 2005/08/08 08:05:36 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_float.c,v 1.14 2005/08/05 08:39:10 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* xdr_float.c, Generic XDR routines implementation.
*
diff --git a/lib/libc/rpc/xdr_mem.c b/lib/libc/rpc/xdr_mem.c
index 9772fa33157..14eeacc5b05 100644
--- a/lib/libc/rpc/xdr_mem.c
+++ b/lib/libc/rpc/xdr_mem.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xdr_mem.c,v 1.12 2005/08/08 08:05:36 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_mem.c,v 1.11 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* xdr_mem.h, XDR implementation using memory buffers.
*
diff --git a/lib/libc/rpc/xdr_rec.c b/lib/libc/rpc/xdr_rec.c
index 15a502e880f..e8d9c264a48 100644
--- a/lib/libc/rpc/xdr_rec.c
+++ b/lib/libc/rpc/xdr_rec.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xdr_rec.c,v 1.11 2005/08/08 08:05:36 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -26,10 +27,6 @@
* 2550 Garcia Avenue
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_rec.c,v 1.10 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
* layer above tcp (for rpc's use).
diff --git a/lib/libc/rpc/xdr_reference.c b/lib/libc/rpc/xdr_reference.c
index ffa3a5cfeee..57159c2c1f9 100644
--- a/lib/libc/rpc/xdr_reference.c
+++ b/lib/libc/rpc/xdr_reference.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xdr_reference.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_reference.c,v 1.6 2005/08/05 08:39:10 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* xdr_reference.c, Generic XDR routines implementation.
*
diff --git a/lib/libc/rpc/xdr_stdio.c b/lib/libc/rpc/xdr_stdio.c
index 0fd044fbbd0..a27f3a1468a 100644
--- a/lib/libc/rpc/xdr_stdio.c
+++ b/lib/libc/rpc/xdr_stdio.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xdr_stdio.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,10 +28,6 @@
* Mountain View, California 94043
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_stdio.c,v 1.7 2005/04/01 07:44:04 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* xdr_stdio.c, XDR implementation on standard i/o file.
*
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index 784a19ff514..7de0bc52ce0 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asprintf.c,v 1.13 2005/05/28 00:54:50 millert Exp $ */
+/* $OpenBSD: asprintf.c,v 1.14 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: asprintf.c,v 1.13 2005/05/28 00:54:50 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
index df1555c53d6..20f19945193 100644
--- a/lib/libc/stdio/clrerr.c
+++ b/lib/libc/stdio/clrerr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: clrerr.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: clrerr.c,v 1.5 2004/09/28 18:12:43 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#undef clearerr
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
index 9ee69664382..bdf6e52fc77 100644
--- a/lib/libc/stdio/fclose.c
+++ b/lib/libc/stdio/fclose.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fclose.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fclose.c,v 1.5 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c
index a5b5fc4852e..1df609c63c9 100644
--- a/lib/libc/stdio/fdopen.c
+++ b/lib/libc/stdio/fdopen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fdopen.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fdopen.c,v 1.4 2004/09/28 18:12:43 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
index 34d36d53caa..eb742da7efd 100644
--- a/lib/libc/stdio/feof.c
+++ b/lib/libc/stdio/feof.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: feof.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: feof.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
/*
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
index 0057c284721..0d2cf01a1bc 100644
--- a/lib/libc/stdio/ferror.c
+++ b/lib/libc/stdio/ferror.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ferror.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ferror.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
/*
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index f6f5c1fdf6d..3f72ad8d99b 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fflush.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fflush.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
index 09d11735728..53e2948813e 100644
--- a/lib/libc/stdio/fgetc.c
+++ b/lib/libc/stdio/fgetc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fgetc.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fgetc.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
int
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index f001243cfbf..f97cfb97e60 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fgetln.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fgetln.c,v 1.6 2005/05/28 04:34:05 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
index ace447a31da..e6188e5a6b1 100644
--- a/lib/libc/stdio/fgetpos.c
+++ b/lib/libc/stdio/fgetpos.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fgetpos.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fgetpos.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
/*
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index 9aef535baeb..92fdcf78ff5 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fgets.c,v 1.10 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fgets.c,v 1.9 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <string.h>
#include "local.h"
diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
index f70b43707fd..783ff919b09 100644
--- a/lib/libc/stdio/fgetws.c
+++ b/lib/libc/stdio/fgetws.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fgetws.c,v 1.1 2005/06/17 20:40:32 espie Exp $ */
+/* $OpenBSD: fgetws.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */
/* $NetBSD: fgetws.c,v 1.1 2003/03/07 07:11:37 tshiozak Exp $ */
/*-
@@ -31,10 +31,6 @@
*
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fgetws.c,v 1.1 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index 04e757f3119..0fd985b23e7 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fileno.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fileno.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
/*
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index b6770c0c94c..27d19843208 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: findfp.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: findfp.c,v 1.8 2005/08/02 08:59:47 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <unistd.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
index d00fe737767..36f8410a293 100644
--- a/lib/libc/stdio/flags.c
+++ b/lib/libc/stdio/flags.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: flags.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: flags.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
index 1b49db2bf50..b063e4545f8 100644
--- a/lib/libc/stdio/fopen.c
+++ b/lib/libc/stdio/fopen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fopen.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fopen.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
index 22310d106d0..7415b2fca39 100644
--- a/lib/libc/stdio/fprintf.c
+++ b/lib/libc/stdio/fprintf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fprintf.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fprintf.c,v 1.5 2003/06/02 20:18:37 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
index e928c73b016..fa0213ac7b7 100644
--- a/lib/libc/stdio/fpurge.c
+++ b/lib/libc/stdio/fpurge.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fpurge.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fpurge.c,v 1.5 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index f64dfd4d60a..2a6e7b7456f 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fputc.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fputc.c,v 1.6 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <errno.h>
#include "local.h"
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index ffb0df788ba..7434ca86d64 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fputs.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fputs.c,v 1.6 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <string.h>
#include "local.h"
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
index f6aa2366e2a..a54ee669608 100644
--- a/lib/libc/stdio/fputws.c
+++ b/lib/libc/stdio/fputws.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fputws.c,v 1.1 2005/06/17 20:40:32 espie Exp $ */
+/* $OpenBSD: fputws.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */
/* $NetBSD: fputws.c,v 1.1 2003/03/07 07:11:37 tshiozak Exp $ */
/*-
@@ -30,10 +30,6 @@
* FreeBSD: src/lib/libc/stdio/fputws.c,v 1.4 2002/09/20 13:25:40 tjr Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fputws.c,v 1.1 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
index d4b118514ac..62906216d8b 100644
--- a/lib/libc/stdio/fread.c
+++ b/lib/libc/stdio/fread.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fread.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fread.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <string.h>
#include "local.h"
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
index 4667332b2d6..414d8108e63 100644
--- a/lib/libc/stdio/freopen.c
+++ b/lib/libc/stdio/freopen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: freopen.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: freopen.c,v 1.8 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index 2094d0a769b..8b4b49642e7 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fscanf.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fscanf.c,v 1.7 2005/03/31 18:36:29 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index af9463a2cbb..4f5014d6e0c 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fseek.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fseek.c,v 1.6 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
index ccf349d3024..9624fe56542 100644
--- a/lib/libc/stdio/fsetpos.c
+++ b/lib/libc/stdio/fsetpos.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fsetpos.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fsetpos.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
/*
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index c511706bb78..b7d449e187d 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ftell.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ftell.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <errno.h>
#include "local.h"
diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c
index fd0496c43da..b85ee96a1f7 100644
--- a/lib/libc/stdio/funopen.c
+++ b/lib/libc/stdio/funopen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: funopen.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: funopen.c,v 1.7 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <errno.h>
#include "local.h"
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index 474bea8e299..e70ff3490ad 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fvwrite.c,v 1.14 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fvwrite.c,v 1.13 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index 41d18a80261..5606cf1e002 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fwalk.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fwalk.c,v 1.6 2005/03/30 19:59:03 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
index 83574b47156..8a508dcdba7 100644
--- a/lib/libc/stdio/fwrite.c
+++ b/lib/libc/stdio/fwrite.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fwrite.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fwrite.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include "local.h"
#include "fvwrite.h"
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index 391c5dc6a2a..cdd572215bd 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getc.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getc.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
/*
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
index e5a72d7a74e..550817de028 100644
--- a/lib/libc/stdio/getchar.c
+++ b/lib/libc/stdio/getchar.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getchar.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getchar.c,v 1.6 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
/*
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index 341084c2ff1..004eb99f487 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: gets.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gets.c,v 1.8 2005/05/28 04:34:05 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
__warn_references(gets,
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
index 2872c3c4df4..6bfb97eb9fd 100644
--- a/lib/libc/stdio/getw.c
+++ b/lib/libc/stdio/getw.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getw.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getw.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
int
diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c
index fd06606b634..ebb34f7b865 100644
--- a/lib/libc/stdio/makebuf.c
+++ b/lib/libc/stdio/makebuf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: makebuf.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: makebuf.c,v 1.6 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index b3ad9af7fcd..5304723166f 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mktemp.c,v 1.19 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mktemp.c,v 1.18 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
index e341805482e..8728718c5d5 100644
--- a/lib/libc/stdio/perror.c
+++ b/lib/libc/stdio/perror.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: perror.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: perror.c,v 1.7 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index 69d36fffc3a..614b4351548 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: printf.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: printf.c,v 1.6 2005/03/31 18:36:29 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index afeac63789f..925021549fb 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: putc.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: putc.c,v 1.6 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <errno.h>
#include "local.h"
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index 109ad19c622..233cdfd0268 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: putchar.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: putchar.c,v 1.6 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#undef putchar_unlocked
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 27acf84fab5..c6ecc24f1a8 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: puts.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: puts.c,v 1.6 2005/03/31 18:36:29 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <string.h>
#include "fvwrite.h"
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index 8bea9b55abd..12955fec848 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: putw.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: putw.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include "fvwrite.h"
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index d94bb17e9c1..74b378e1488 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: refill.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: refill.c,v 1.7 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index 10c004930bd..d09d76f9df2 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remove.c,v 1.6 2004/09/28 18:12:44 otto Exp $ */
+/* $OpenBSD: remove.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)remove.c 8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$OpenBSD: remove.c,v 1.6 2004/09/28 18:12:44 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <unistd.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index 3713c5dfdc3..28119b6a884 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rewind.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rewind.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
index ecbb8b80c0b..4cd97cbe9a4 100644
--- a/lib/libc/stdio/rget.c
+++ b/lib/libc/stdio/rget.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rget.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rget.c,v 1.6 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index 061ad3489ad..71194d04e7a 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: scanf.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: scanf.c,v 1.8 2005/05/11 18:39:19 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
index a1b1630a5b2..883b89532b8 100644
--- a/lib/libc/stdio/setbuf.c
+++ b/lib/libc/stdio/setbuf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setbuf.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setbuf.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
index 3135b0ff73c..8725ff79558 100644
--- a/lib/libc/stdio/setbuffer.c
+++ b/lib/libc/stdio/setbuffer.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setbuffer.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setbuffer.c,v 1.4 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
void
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index 3605e77e290..9b92bf08113 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setvbuf.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setvbuf.c,v 1.7 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include "local.h"
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index 7291c08aa66..5f0a7349fc8 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: snprintf.c,v 1.13 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: snprintf.c,v 1.12 2005/05/28 00:54:50 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <limits.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index a2cb5819a4a..a31246c91db 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sprintf.c,v 1.12 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sprintf.c,v 1.11 2005/04/30 09:25:17 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdarg.h>
#include <limits.h>
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index 4c1b8d83d78..a0bdf1c5262 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sscanf.c,v 1.12 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sscanf.c,v 1.11 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index 2b3a25d6312..a4a27b53b64 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: stdio.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: stdio.c,v 1.8 2005/03/31 18:36:29 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <fcntl.h>
#include <unistd.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index 2c71e73b070..3b7ec75c702 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tempnam.c,v 1.14 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tempnam.c,v 1.13 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c
index 93459ec735a..8a1b7fb0628 100644
--- a/lib/libc/stdio/tmpfile.c
+++ b/lib/libc/stdio/tmpfile.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tmpfile.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tmpfile.c,v 1.8 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index a2f17dfe5ae..32e0a220202 100644
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tmpnam.c,v 1.10 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.9 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index 579ab2cd90d..fe05258a84e 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ungetc.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ungetc.c,v 1.8 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index f0145b9450c..77114bb1d1b 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vasprintf.c,v 1.10 2005/04/30 09:25:17 espie Exp $ */
+/* $OpenBSD: vasprintf.c,v 1.11 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vasprintf.c,v 1.10 2005/04/30 09:25:17 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index c99c8336efc..78c8b77a0d2 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vfprintf.c,v 1.32 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: vfprintf.c,v 1.31 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Actual printf innards.
*
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index cf184c6ef3e..0546c5c5145 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vfscanf.c,v 1.15 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vfscanf.c,v 1.14 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 304f5352672..42e01eaf5f1 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vprintf.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vprintf.c,v 1.6 2005/03/31 18:36:29 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
int
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index 898acc339d0..c14ed80b692 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vscanf.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vscanf.c,v 1.6 2005/05/11 18:39:19 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
int
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index 4efa3e636b4..d9fb7f8872c 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vsnprintf.c,v 1.10 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vsnprintf.c,v 1.9 2005/05/28 04:34:05 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <limits.h>
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 958a12e8b67..91462fe1551 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vsprintf.c,v 1.11 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vsprintf.c,v 1.10 2005/04/30 09:25:17 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <limits.h>
#include "local.h"
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 7b6040a26b4..52b241751c7 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vsscanf.c,v 1.10 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vsscanf.c,v 1.9 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <string.h>
#include "local.h"
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index 2f702668a92..c757799d47c 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wbuf.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: wbuf.c,v 1.8 2005/06/17 20:40:32 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <errno.h>
#include "local.h"
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index efc7655f92f..083422365f6 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wsetup.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: wsetup.c,v 1.6 2004/09/28 18:12:44 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include "local.h"
diff --git a/lib/libc/stdlib/_Exit.c b/lib/libc/stdlib/_Exit.c
index 784015a21d6..5a2291a931e 100644
--- a/lib/libc/stdlib/_Exit.c
+++ b/lib/libc/stdlib/_Exit.c
@@ -1,13 +1,9 @@
-/* $OpenBSD: _Exit.c,v 1.1 2004/05/03 17:21:13 millert Exp $ */
+/* $OpenBSD: _Exit.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */
/*
* Placed in the public domain by Todd C. Miller on January 21, 2004.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: _Exit.c,v 1.1 2004/05/03 17:21:13 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/stdlib/_rand48.c b/lib/libc/stdlib/_rand48.c
index fed7372f68c..7c950f7cee0 100644
--- a/lib/libc/stdlib/_rand48.c
+++ b/lib/libc/stdlib/_rand48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: _rand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _rand48.c,v 1.2 1996/08/19 08:33:19 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
unsigned short __rand48_seed[3] = {
diff --git a/lib/libc/stdlib/a64l.c b/lib/libc/stdlib/a64l.c
index 518bdb64f90..5312929c6fd 100644
--- a/lib/libc/stdlib/a64l.c
+++ b/lib/libc/stdlib/a64l.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: a64l.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: a64l.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
index 2430c124f99..072a9fa8c11 100644
--- a/lib/libc/stdlib/abort.c
+++ b/lib/libc/stdlib/abort.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: abort.c,v 1.14 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1985 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: abort.c,v 1.13 2004/01/20 19:35:17 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c
index a471ab3a1ef..5d2fbae69f1 100644
--- a/lib/libc/stdlib/abs.c
+++ b/lib/libc/stdlib/abs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: abs.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: abs.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
int
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
index 0bffc05344c..019b9015750 100644
--- a/lib/libc/stdlib/atexit.c
+++ b/lib/libc/stdlib/atexit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: atexit.c,v 1.10 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 2002 Daniel Hartmeier
* All rights reserved.
@@ -28,10 +29,6 @@
*
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: atexit.c,v 1.9 2005/06/17 21:38:59 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/mman.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c
index 2724530231c..d14b58b0700 100644
--- a/lib/libc/stdlib/atof.c
+++ b/lib/libc/stdlib/atof.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: atof.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: atof.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
double
diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c
index ea821ced3d8..b0842678e2f 100644
--- a/lib/libc/stdlib/atoi.c
+++ b/lib/libc/stdlib/atoi.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: atoi.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: atoi.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
int
diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c
index 38236b556cd..1970804401c 100644
--- a/lib/libc/stdlib/atol.c
+++ b/lib/libc/stdlib/atol.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: atol.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: atol.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
long
diff --git a/lib/libc/stdlib/atoll.c b/lib/libc/stdlib/atoll.c
index 6786b62e1ac..a65e682cfb4 100644
--- a/lib/libc/stdlib/atoll.c
+++ b/lib/libc/stdlib/atoll.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: atoll.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: atoll.c,v 1.2 2003/06/02 20:18:37 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
long long
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index 109211da92e..8193d27c604 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: bsearch.c,v 1.5 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
/*
diff --git a/lib/libc/stdlib/calloc.c b/lib/libc/stdlib/calloc.c
index 7aabed235fc..7105141db82 100644
--- a/lib/libc/stdlib/calloc.c
+++ b/lib/libc/stdlib/calloc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: calloc.c,v 1.10 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: calloc.c,v 1.9 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
#include <string.h>
#include <limits.h>
diff --git a/lib/libc/stdlib/cfree.c b/lib/libc/stdlib/cfree.c
index db1fa560396..373c7ff75d3 100644
--- a/lib/libc/stdlib/cfree.c
+++ b/lib/libc/stdlib/cfree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfree.c,v 1.4 2005/03/30 18:51:49 pat Exp $ */
+/* $OpenBSD: cfree.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -25,10 +25,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cfree.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
index 32c53dff03f..f7ac2db4b04 100644
--- a/lib/libc/stdlib/div.c
+++ b/lib/libc/stdlib/div.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: div.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1990 Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: div.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h> /* div_t */
div_t
diff --git a/lib/libc/stdlib/drand48.c b/lib/libc/stdlib/drand48.c
index 02886d5b621..b6c046c8317 100644
--- a/lib/libc/stdlib/drand48.c
+++ b/lib/libc/stdlib/drand48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: drand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: drand48.c,v 1.2 1996/08/19 08:33:29 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
extern unsigned short __rand48_seed[3];
diff --git a/lib/libc/stdlib/ecvt.c b/lib/libc/stdlib/ecvt.c
index 657c531808c..9289b3bf8a1 100644
--- a/lib/libc/stdlib/ecvt.c
+++ b/lib/libc/stdlib/ecvt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecvt.c,v 1.3 2003/06/17 21:56:24 millert Exp $ */
+/* $OpenBSD: ecvt.c,v 1.4 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ecvt.c,v 1.3 2003/06/17 21:56:24 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdlib/erand48.c b/lib/libc/stdlib/erand48.c
index b92dacffcc3..2ffeaa6e710 100644
--- a/lib/libc/stdlib/erand48.c
+++ b/lib/libc/stdlib/erand48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: erand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: erand48.c,v 1.2 1996/08/19 08:33:29 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
double
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
index a0960e83c4a..90b7d5adc2d 100644
--- a/lib/libc/stdlib/exit.c
+++ b/lib/libc/stdlib/exit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: exit.c,v 1.11 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: exit.c,v 1.10 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/mman.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/gcvt.c b/lib/libc/stdlib/gcvt.c
index 9fd664b346c..849af60304f 100644
--- a/lib/libc/stdlib/gcvt.c
+++ b/lib/libc/stdlib/gcvt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gcvt.c,v 1.5 2003/06/17 21:56:24 millert Exp $ */
+/* $OpenBSD: gcvt.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 2002, 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gcvt.c,v 1.5 2003/06/17 21:56:24 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 7e4d6b91a9e..72367b34e27 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: getenv.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getenv.c,v 1.7 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 6ddc8e20601..1bf7996998c 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getopt_long.c,v 1.18 2005/03/30 18:51:49 pat Exp $ */
+/* $OpenBSD: getopt_long.c,v 1.19 2005/08/08 08:05:36 espie Exp $ */
/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
/*
@@ -56,10 +56,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getopt_long.c,v 1.18 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <err.h>
#include <errno.h>
#include <getopt.h>
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
index dfd7a50bd89..735c85ba8a7 100644
--- a/lib/libc/stdlib/getsubopt.c
+++ b/lib/libc/stdlib/getsubopt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getsubopt.c,v 1.3 2005/03/30 18:51:49 pat Exp $ */
+/* $OpenBSD: getsubopt.c,v 1.4 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getsubopt.c 8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$OpenBSD: getsubopt.c,v 1.3 2005/03/30 18:51:49 pat Exp $";
-#endif
-#endif /* not lint */
-
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index 14e6fa41f23..e9b5ceed113 100644
--- a/lib/libc/stdlib/hcreate.c
+++ b/lib/libc/stdlib/hcreate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hcreate.c,v 1.1 2004/06/24 04:43:33 millert Exp $ */
+/* $OpenBSD: hcreate.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */
/* $NetBSD: hcreate.c,v 1.5 2004/04/23 02:48:12 simonb Exp $ */
/*
@@ -47,15 +47,6 @@
* nobody had a copy in the office, so...
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 2001 Christopher G. Demetriou. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hcreate.c,v 1.1 2004/06/24 04:43:33 millert Exp $";
-#endif /* not lint */
-
#include "namespace.h"
#include <assert.h>
#include <errno.h>
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index dcc0c8baad6..e6fb61ba2fb 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -30,10 +30,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: heapsort.c,v 1.7 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/insque.c b/lib/libc/stdlib/insque.c
index 549246c71f5..8724efec74a 100644
--- a/lib/libc/stdlib/insque.c
+++ b/lib/libc/stdlib/insque.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: insque.c,v 1.1 2003/05/08 23:26:30 millert Exp $ */
+/* $OpenBSD: insque.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1993 John Brezak
@@ -28,10 +28,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: insque.c,v 1.1 2003/05/08 23:26:30 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <search.h>
struct qelem {
diff --git a/lib/libc/stdlib/jrand48.c b/lib/libc/stdlib/jrand48.c
index 99cddb71e5f..cb8c5927503 100644
--- a/lib/libc/stdlib/jrand48.c
+++ b/lib/libc/stdlib/jrand48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: jrand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: jrand48.c,v 1.2 1996/08/19 08:33:33 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
long
diff --git a/lib/libc/stdlib/l64a.c b/lib/libc/stdlib/l64a.c
index 325b41b33b2..4f33df37b2a 100644
--- a/lib/libc/stdlib/l64a.c
+++ b/lib/libc/stdlib/l64a.c
@@ -1,12 +1,9 @@
+/* $OpenBSD: l64a.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: l64a.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c
index 1dc8b0184a1..ca60b9aba2d 100644
--- a/lib/libc/stdlib/labs.c
+++ b/lib/libc/stdlib/labs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: labs.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: labs.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
long
diff --git a/lib/libc/stdlib/lcong48.c b/lib/libc/stdlib/lcong48.c
index 44bd74e48a7..2cf5c271ba0 100644
--- a/lib/libc/stdlib/lcong48.c
+++ b/lib/libc/stdlib/lcong48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lcong48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lcong48.c,v 1.2 1996/08/19 08:33:35 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
extern unsigned short __rand48_seed[3];
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
index bbb539a68b0..775065f525c 100644
--- a/lib/libc/stdlib/ldiv.c
+++ b/lib/libc/stdlib/ldiv.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ldiv.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1990 Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ldiv.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h> /* ldiv_t */
ldiv_t
diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c
index 9611b5aefd3..0a0ff784af9 100644
--- a/lib/libc/stdlib/llabs.c
+++ b/lib/libc/stdlib/llabs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: llabs.c,v 1.1 2003/07/21 20:20:04 millert Exp $ */
+/* $OpenBSD: llabs.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -33,13 +33,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: llabs.c,v 1.1 2003/07/21 20:20:04 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
-long long llabs(long long j)
+long long
+llabs(long long j)
{
return (j < 0 ? -j : j);
}
diff --git a/lib/libc/stdlib/lrand48.c b/lib/libc/stdlib/lrand48.c
index 6b7524a51bc..21beb858ca1 100644
--- a/lib/libc/stdlib/lrand48.c
+++ b/lib/libc/stdlib/lrand48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lrand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lrand48.c,v 1.2 1996/08/19 08:33:36 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
extern unsigned short __rand48_seed[3];
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 5a328b0eb05..65675456ecb 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: malloc.c,v 1.76 2005/08/08 08:05:36 espie Exp $ */
/*
* ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42):
@@ -7,10 +8,6 @@
* ----------------------------------------------------------------------------
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: malloc.c,v 1.75 2005/07/07 05:28:53 tdeval Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Defining MALLOC_EXTRA_SANITY will enable extra checks which are
* related to internal conditions and consistency in malloc.c. This has
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index b193ae345c5..623f6521349 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: merge.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: merge.c,v 1.7 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Hybrid exponential search/linear search merge sort with hybrid
* natural/pairwise first pass. Requires about .3% more comparisons
diff --git a/lib/libc/stdlib/mrand48.c b/lib/libc/stdlib/mrand48.c
index cd34260b5cc..977264aba50 100644
--- a/lib/libc/stdlib/mrand48.c
+++ b/lib/libc/stdlib/mrand48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mrand48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mrand48.c,v 1.2 1996/08/19 08:33:39 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
extern unsigned short __rand48_seed[3];
diff --git a/lib/libc/stdlib/multibyte.c b/lib/libc/stdlib/multibyte.c
deleted file mode 100644
index ba878b8fdc9..00000000000
--- a/lib/libc/stdlib/multibyte.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: multibyte.c,v 1.4 2003/06/02 20:18:38 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdlib.h>
-
-/*
- * Stub multibyte character functions.
- * This cheezy implementation is fixed to the native single-byte
- * character set.
- */
-
-int
-mblen(s, n)
- const char *s;
- size_t n;
-{
- if (s == NULL || *s == '\0')
- return 0;
- if (n == 0)
- return -1;
- return 1;
-}
-
-/*ARGSUSED*/
-int
-mbtowc(pwc, s, n)
- wchar_t *pwc;
- const char *s;
- size_t n;
-{
- if (s == NULL)
- return 0;
- if (n == 0)
- return -1;
- if (pwc)
- *pwc = (wchar_t) *s;
- return (*s != '\0');
-}
-
-/*ARGSUSED*/
-int
-wctomb(char *s, wchar_t wchar)
-{
- if (s == NULL)
- return 0;
-
- *s = (char) wchar;
- return 1;
-}
-
-/*ARGSUSED*/
-size_t
-mbstowcs(pwcs, s, n)
- wchar_t *pwcs;
- const char *s;
- size_t n;
-{
- int count = 0;
-
- if (n != 0) {
- do {
- if ((*pwcs++ = (wchar_t) *s++) == 0)
- break;
- count++;
- } while (--n != 0);
- }
-
- return count;
-}
-
-/*ARGSUSED*/
-size_t
-wcstombs(s, pwcs, n)
- char *s;
- const wchar_t *pwcs;
- size_t n;
-{
- int count = 0;
-
- if (n != 0) {
- do {
- if ((*s++ = (char) *pwcs++) == 0)
- break;
- count++;
- } while (--n != 0);
- }
-
- return count;
-}
-
diff --git a/lib/libc/stdlib/nrand48.c b/lib/libc/stdlib/nrand48.c
index b1ec2cebb1a..f1f548c3af5 100644
--- a/lib/libc/stdlib/nrand48.c
+++ b/lib/libc/stdlib/nrand48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: nrand48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: nrand48.c,v 1.2 1996/08/19 08:33:40 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
long
diff --git a/lib/libc/stdlib/putenv.c b/lib/libc/stdlib/putenv.c
index 231982bf877..54482f6a144 100644
--- a/lib/libc/stdlib/putenv.c
+++ b/lib/libc/stdlib/putenv.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: putenv.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: putenv.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdlib/qabs.c b/lib/libc/stdlib/qabs.c
index 4c561b33516..656b93c822f 100644
--- a/lib/libc/stdlib/qabs.c
+++ b/lib/libc/stdlib/qabs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: qabs.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: qabs.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
quad_t
diff --git a/lib/libc/stdlib/qdiv.c b/lib/libc/stdlib/qdiv.c
index 8147ee89a6c..f3db0915ed2 100644
--- a/lib/libc/stdlib/qdiv.c
+++ b/lib/libc/stdlib/qdiv.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: qdiv.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1990 Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: qdiv.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h> /* qdiv_t */
qdiv_t
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 154c51a86cd..bb4a9a11f2b 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: qsort.c,v 1.10 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: qsort.c,v 1.9 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 96392ea73a8..0b2ff27044f 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: radixsort.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: radixsort.c,v 1.7 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Radixsort routines.
*
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index 6b27ad46d35..0f9c100807f 100644
--- a/lib/libc/stdlib/rand.c
+++ b/lib/libc/stdlib/rand.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rand.c,v 1.8 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index 4ca8735e759..565542ecdb2 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: random.c,v 1.14 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: random.c,v 1.13 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/time.h>
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
index 62e06b00be8..4cb847b3137 100644
--- a/lib/libc/stdlib/realpath.c
+++ b/lib/libc/stdlib/realpath.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: realpath.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
*
@@ -26,15 +27,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/lib/libc/stdlib/realpath.c,v 1.9.2.1 2003/05/22 17:11:44 fjoe Exp $");
-#endif
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: realpath.c,v 1.12 2005/03/29 19:34:14 brad Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdlib/remque.c b/lib/libc/stdlib/remque.c
index f4c5769a8c1..ae249ae0538 100644
--- a/lib/libc/stdlib/remque.c
+++ b/lib/libc/stdlib/remque.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remque.c,v 1.1 2003/05/08 23:26:30 millert Exp $ */
+/* $OpenBSD: remque.c,v 1.2 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1993 John Brezak
@@ -28,10 +28,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: remque.c,v 1.1 2003/05/08 23:26:30 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <search.h>
struct qelem {
diff --git a/lib/libc/stdlib/seed48.c b/lib/libc/stdlib/seed48.c
index c4dcd0ead80..583262f2d53 100644
--- a/lib/libc/stdlib/seed48.c
+++ b/lib/libc/stdlib/seed48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: seed48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: seed48.c,v 1.2 1996/08/19 08:33:48 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
extern unsigned short __rand48_seed[3];
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
index ce0d3f96999..36540ebb0c8 100644
--- a/lib/libc/stdlib/setenv.c
+++ b/lib/libc/stdlib/setenv.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: setenv.c,v 1.9 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setenv.c,v 1.8 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdlib/srand48.c b/lib/libc/stdlib/srand48.c
index fcff8a172ec..f76b6cca86c 100644
--- a/lib/libc/stdlib/srand48.c
+++ b/lib/libc/stdlib/srand48.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: srand48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
* All rights reserved.
@@ -11,10 +12,6 @@
* to anyone/anything when using this software.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: srand48.c,v 1.2 1996/08/19 08:33:49 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "rand48.h"
extern unsigned short __rand48_seed[3];
diff --git a/lib/libc/stdlib/strtod.c b/lib/libc/stdlib/strtod.c
index 94eca88659f..2f0de36d90a 100644
--- a/lib/libc/stdlib/strtod.c
+++ b/lib/libc/stdlib/strtod.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strtod.c,v 1.21 2005/08/08 08:05:37 espie Exp $ */
/****************************************************************
*
* The author of this software is David M. Gay.
@@ -88,10 +89,6 @@
* directly -- and assumed always to succeed.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strtod.c,v 1.20 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
defined(__powerpc__) || defined(__m88k__) || defined(__hppa__) || \
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index 9692bb6b07e..5a244766db7 100644
--- a/lib/libc/stdlib/strtol.c
+++ b/lib/libc/stdlib/strtol.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strtol.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strtol.c,v 1.6 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index fa4d30ef5ae..b9ffc3d47ad 100644
--- a/lib/libc/stdlib/strtoll.c
+++ b/lib/libc/stdlib/strtoll.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: strtoll.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index 1faa0abbd0e..d7dddab7784 100644
--- a/lib/libc/stdlib/strtoul.c
+++ b/lib/libc/stdlib/strtoul.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strtoul.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1990 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strtoul.c,v 1.6 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index 5fa841fff7a..37859776f9b 100644
--- a/lib/libc/stdlib/strtoull.c
+++ b/lib/libc/stdlib/strtoull.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strtoull.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: strtoull.c,v 1.4 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
index ebf5577674d..14ddcae8d3e 100644
--- a/lib/libc/stdlib/system.c
+++ b/lib/libc/stdlib/system.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: system.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: system.c,v 1.7 2005/03/30 18:51:49 pat Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 07d32ed0438..a35689a209e 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcmp.c,v 1.7 2005/03/30 20:13:52 otto Exp $ */
+/* $OpenBSD: bcmp.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: bcmp.c,v 1.7 2005/03/30 20:13:52 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index 7b30ab4abb9..4308c6484ab 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: bcopy.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: bcopy.c,v 1.4 2005/03/30 20:13:52 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/bm.c b/lib/libc/string/bm.c
index 6c8e4c3472a..829c24082e5 100644
--- a/lib/libc/string/bm.c
+++ b/lib/libc/string/bm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: bm.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: bm.c,v 1.5 2005/03/30 20:13:52 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <bm.h>
diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
index 9d8a2cef3a2..4d267d4f401 100644
--- a/lib/libc/string/bzero.c
+++ b/lib/libc/string/bzero.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bzero.c,v 1.6 2004/11/28 07:16:54 mickey Exp $ */
+/* $OpenBSD: bzero.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: bzero.c,v 1.6 2004/11/28 07:16:54 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index f1d14096a20..7dec1613a82 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -1,14 +1,10 @@
-/* $OpenBSD: ffs.c,v 1.6 2003/06/11 21:08:16 deraadt Exp $ */
+/* $OpenBSD: ffs.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*
* Public domain.
* Written by Dale Rahn.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ffs.c,v 1.6 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
index 52d0fd46fa2..50e9ca35abd 100644
--- a/lib/libc/string/index.c
+++ b/lib/libc/string/index.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: index.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: index.c,v 1.4 2003/06/02 20:18:38 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
char *
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
index 265570c5a42..485c55fcabf 100644
--- a/lib/libc/string/memccpy.c
+++ b/lib/libc/string/memccpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memccpy.c,v 1.5 2005/03/30 20:13:52 otto Exp $ */
+/* $OpenBSD: memccpy.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)memccpy.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: memccpy.c,v 1.5 2005/03/30 20:13:52 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
void *
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index 454abcbc17f..4573e3ceb11 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: memchr.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: memchr.c,v 1.6 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
void *
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index 6c83208a7b4..49384a6fb99 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: memcmp.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: memcmp.c,v 1.4 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index 9bc0556faa4..db32866a0e4 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: memset.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: memset.c,v 1.4 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
void *
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
index b880d0eaeba..bf9d6f7cf12 100644
--- a/lib/libc/string/rindex.c
+++ b/lib/libc/string/rindex.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rindex.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rindex.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
char *
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
index 62da0634445..2be09136c07 100644
--- a/lib/libc/string/strcasecmp.c
+++ b/lib/libc/string/strcasecmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcasecmp.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $ */
+/* $OpenBSD: strcasecmp.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -31,14 +31,6 @@
#include <string.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: strcasecmp.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
typedef unsigned char u_char;
/*
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
index 075e6f19874..07c8c2e8fb3 100644
--- a/lib/libc/string/strcasestr.c
+++ b/lib/libc/string/strcasestr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcasestr.c,v 1.1 2005/03/30 03:04:19 deraadt Exp $ */
+/* $OpenBSD: strcasestr.c,v 1.2 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: strcasestr.c,v 1.2 2005/02/09 21:35:47 kleink Exp $ */
/*-
@@ -33,10 +33,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strcasestr.c,v 1.1 2005/03/30 03:04:19 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <ctype.h>
#include <string.h>
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index 4f9734ab9e3..7cea5229fb6 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcat.c,v 1.7 2004/11/28 07:16:54 mickey Exp $ */
+/* $OpenBSD: strcat.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strcat.c,v 1.7 2004/11/28 07:16:54 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index 0fe34c28044..816fd111ac5 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcmp.c,v 1.6 2004/11/28 07:16:54 mickey Exp $ */
+/* $OpenBSD: strcmp.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strcmp.c,v 1.6 2004/11/28 07:16:54 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index 9622b67281f..2df983bd652 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strcoll.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strcoll.c,v 1.4 2003/06/11 21:08:29 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index 0acd1bbadf0..71d90d41002 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcpy.c,v 1.7 2004/11/28 07:16:54 mickey Exp $ */
+/* $OpenBSD: strcpy.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strcpy.c,v 1.7 2004/11/28 07:16:54 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index f96f9038097..1eb233614d0 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strcspn.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strcspn.c,v 1.4 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c
index bbea59888cf..a6aa1e03b0f 100644
--- a/lib/libc/string/strdup.c
+++ b/lib/libc/string/strdup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strdup.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $ */
+/* $OpenBSD: strdup.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: strdup.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <stddef.h>
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index edb6af73864..13996f08e98 100644
--- a/lib/libc/string/strerror.c
+++ b/lib/libc/string/strerror.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strerror.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strerror.c,v 1.6 2004/05/03 05:07:34 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
#include <limits.h>
diff --git a/lib/libc/string/strerror_r.c b/lib/libc/string/strerror_r.c
index 958a88df3eb..85988a25619 100644
--- a/lib/libc/string/strerror_r.c
+++ b/lib/libc/string/strerror_r.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: strerror_r.c,v 1.5 2005/05/26 12:56:01 otto Exp $ */
+/* $OpenBSD: strerror_r.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/* Public Domain <marc@snafu.org> */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strerror_r.c,v 1.5 2005/05/26 12:56:01 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#ifdef NLS
#define catclose _catclose
#define catgets _catgets
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c
index 952eed1a794..ceab094411d 100644
--- a/lib/libc/string/strlcat.c
+++ b/lib/libc/string/strlcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlcat.c,v 1.12 2005/03/30 20:13:52 otto Exp $ */
+/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcat.c,v 1.12 2005/03/30 20:13:52 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <string.h>
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
index 09a9c2b360a..110155f76fa 100644
--- a/lib/libc/string/strlcpy.c
+++ b/lib/libc/string/strlcpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlcpy.c,v 1.9 2005/03/30 20:13:52 otto Exp $ */
+/* $OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.9 2005/03/30 20:13:52 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <string.h>
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index 298a9966a34..12d9ec4dadb 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlen.c,v 1.6 2003/06/11 21:08:16 deraadt Exp $ */
+/* $OpenBSD: strlen.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlen.c,v 1.6 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index eedd65aaf33..6f0fa34ed87 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strmode.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strmode.c,v 1.6 2005/06/15 17:48:52 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
index 05d35e0900a..c4df4f2fad6 100644
--- a/lib/libc/string/strncat.c
+++ b/lib/libc/string/strncat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strncat.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strncat.c,v 1.4 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index ddab42dc759..0aea80d7d90 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncmp.c,v 1.6 2004/11/28 07:16:54 mickey Exp $ */
+/* $OpenBSD: strncmp.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strncmp.c,v 1.6 2004/11/28 07:16:54 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index d73008c6dbd..4426cbe2e3f 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncpy.c,v 1.5 2004/11/28 07:16:54 mickey Exp $ */
+/* $OpenBSD: strncpy.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strncpy.c,v 1.5 2004/11/28 07:16:54 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
index 024c42bdc3e..cd3b71c0d3e 100644
--- a/lib/libc/string/strpbrk.c
+++ b/lib/libc/string/strpbrk.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strpbrk.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1985 Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strpbrk.c,v 1.4 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
index 337d78e466d..bcca681e033 100644
--- a/lib/libc/string/strsep.c
+++ b/lib/libc/string/strsep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $ */
+/* $OpenBSD: strsep.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -32,14 +32,6 @@
#include <string.h>
#include <stdio.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* Get next token from string *stringp, where tokens are possibly-empty
* strings separated by characters from delim.
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
index afe0deb272a..aa541cefede 100644
--- a/lib/libc/string/strsignal.c
+++ b/lib/libc/string/strsignal.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strsignal.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
#include <limits.h>
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index d51a8cd3e6c..385649c0419 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strspn.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strspn.c,v 1.4 2003/06/11 21:08:29 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index e6a94c5ce65..95a865bf791 100644
--- a/lib/libc/string/strstr.c
+++ b/lib/libc/string/strstr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strstr.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strstr.c,v 1.4 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
index 6498eac8cc7..4e963a019e0 100644
--- a/lib/libc/string/strtok.c
+++ b/lib/libc/string/strtok.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strtok.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
char *
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index a2e2dbc4405..6f289c901ec 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strxfrm.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strxfrm.c,v 1.5 2003/09/06 22:43:12 tedu Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
/*
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index 0129561aa33..b53717dcde4 100644
--- a/lib/libc/string/swab.c
+++ b/lib/libc/string/swab.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: swab.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -30,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: swab.c,v 1.6 2005/03/30 20:13:52 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <unistd.h>
void
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 80de3f0d5ec..a4841a975af 100644
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcscat.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcscat.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcscat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcscat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcscat.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
#if defined(APIWARN)
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index 80861225174..c06127e087e 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcschr.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcschr.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcschr.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcschr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcschr.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
index ebbb87ca4d7..4a8f6ba3fb9 100644
--- a/lib/libc/string/wcscmp.c
+++ b/lib/libc/string/wcscmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcscmp.c,v 1.3 2005/08/08 05:53:01 espie Exp $ */
+/* $OpenBSD: wcscmp.c,v 1.4 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcscmp.c,v 1.5 2003/08/07 16:43:54 agc Exp $ */
/*-
@@ -33,10 +33,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcscmp.c,v 1.3 2005/08/08 05:53:01 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
#include "locale/runetype.h"
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
index e5bf8b0dbf3..75fdb75fe45 100644
--- a/lib/libc/string/wcscpy.c
+++ b/lib/libc/string/wcscpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcscpy.c,v 1.3 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcscpy.c,v 1.4 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcscpy.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcscpy.c,v 1.2 2000/12/21 04:51:09 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcscpy.c,v 1.3 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
#if defined(APIWARN)
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
index 59a95101560..cf40092465e 100644
--- a/lib/libc/string/wcscspn.c
+++ b/lib/libc/string/wcscspn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcscspn.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcscspn.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcscspn.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcscspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcscspn.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
size_t
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
index e74d52f4ebb..bcd52d1f3c5 100644
--- a/lib/libc/string/wcslcat.c
+++ b/lib/libc/string/wcslcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcslcat.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcslcat.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcslcat.c,v 1.2 2001/01/03 14:33:02 lukem Exp $ */
/* from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp */
@@ -29,10 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcslcat.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <wchar.h>
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
index a6acb80d580..4a9afffd98c 100644
--- a/lib/libc/string/wcslcpy.c
+++ b/lib/libc/string/wcslcpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcslcpy.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcslcpy.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcslcpy.c,v 1.2 2001/01/03 14:33:02 lukem Exp $ */
/* from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp */
@@ -29,10 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcslcpy.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <wchar.h>
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
index 8bd5b5d07f3..c1de4a271e4 100644
--- a/lib/libc/string/wcslen.c
+++ b/lib/libc/string/wcslen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcslen.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcslen.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcslen.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcslen.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcslen.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
size_t
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
index b8e000c864f..eb9a701514a 100644
--- a/lib/libc/string/wcsncat.c
+++ b/lib/libc/string/wcsncat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcsncat.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcsncat.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcsncat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcsncat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcsncat.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
index 30d37f66579..fb3c7057cf9 100644
--- a/lib/libc/string/wcsncmp.c
+++ b/lib/libc/string/wcsncmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcsncmp.c,v 1.3 2005/08/08 05:53:01 espie Exp $ */
+/* $OpenBSD: wcsncmp.c,v 1.4 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcsncmp.c,v 1.5 2003/08/07 16:43:54 agc Exp $ */
/*
@@ -30,10 +30,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcsncmp.c,v 1.3 2005/08/08 05:53:01 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
#include "locale/runetype.h"
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
index 2bf020e2681..5da7edb06e4 100644
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcsncpy.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcsncpy.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcsncpy.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcsncpy.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcsncpy.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
index 943057a2e67..1923abfc89b 100644
--- a/lib/libc/string/wcspbrk.c
+++ b/lib/libc/string/wcspbrk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcspbrk.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcspbrk.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcspbrk.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcspbrk.c,v 1.2 2000/12/21 05:07:25 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcspbrk.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index ced0fe3aae7..3433310c56f 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcsrchr.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcsrchr.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcsrchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcsrchr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcsrchr.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
index 80f315f0716..5162fa07631 100644
--- a/lib/libc/string/wcsspn.c
+++ b/lib/libc/string/wcsspn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcsspn.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcsspn.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcsspn.c,v 1.3 2001/09/21 16:09:15 yamt Exp $ */
/*-
@@ -29,10 +29,6 @@
* $Citrus: xpg4dl/FreeBSD/lib/libc/string/wcsspn.c,v 1.3 2001/09/21 16:06:43 yamt Exp $
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcsspn.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
size_t
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index 9f3303004a1..669e3402808 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcsstr.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcsstr.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcsstr.c,v 1.3 2003/03/05 20:18:17 tshiozak Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcsstr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcsstr.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcstok.c b/lib/libc/string/wcstok.c
index 619aea8acbe..bc1ac3e8cbd 100644
--- a/lib/libc/string/wcstok.c
+++ b/lib/libc/string/wcstok.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcstok.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcstok.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcstok.c,v 1.3 2003/07/10 08:50:48 tshiozak Exp $ */
/*-
@@ -42,10 +42,6 @@
* FreeBSD: src/lib/libc/string/wcstok.c,v 1.1 2002/09/07 08:16:57 tjr Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcstok.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
index ff6b4e1d3ed..cd240897b58 100644
--- a/lib/libc/string/wcswidth.c
+++ b/lib/libc/string/wcswidth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcswidth.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wcswidth.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wcswidth.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wcswidth.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wcswidth.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
int
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
index f3b8023c135..8c9517861b3 100644
--- a/lib/libc/string/wmemchr.c
+++ b/lib/libc/string/wmemchr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wmemchr.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wmemchr.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wmemchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wmemchr.c,v 1.2 2000/12/20 14:08:31 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wmemchr.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
index e35c6207ff6..39419aeddc4 100644
--- a/lib/libc/string/wmemcmp.c
+++ b/lib/libc/string/wmemcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wmemcmp.c,v 1.3 2005/08/08 05:53:01 espie Exp $ */
+/* $OpenBSD: wmemcmp.c,v 1.4 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wmemcmp.c,v 1.3 2003/04/06 18:33:23 tshiozak Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wmemcmp.c,v 1.2 2000/12/20 14:08:31 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wmemcmp.c,v 1.3 2005/08/08 05:53:01 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
#include "locale/runetype.h"
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
index 6e7e030472d..9bbd83648e7 100644
--- a/lib/libc/string/wmemcpy.c
+++ b/lib/libc/string/wmemcpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wmemcpy.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wmemcpy.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wmemcpy.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wmemcpy.c,v 1.2 2000/12/20 14:08:31 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wmemcpy.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
#include <wchar.h>
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
index 5de24306567..21bbabcd0cd 100644
--- a/lib/libc/string/wmemmove.c
+++ b/lib/libc/string/wmemmove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wmemmove.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wmemmove.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wmemmove.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wmemmove.c,v 1.2 2000/12/20 14:08:31 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wmemmove.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <string.h>
#include <wchar.h>
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
index 9db63f05da9..ac476dba6ad 100644
--- a/lib/libc/string/wmemset.c
+++ b/lib/libc/string/wmemset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wmemset.c,v 1.2 2005/06/19 22:12:07 espie Exp $ */
+/* $OpenBSD: wmemset.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
/* $NetBSD: wmemset.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */
/*-
@@ -29,10 +29,6 @@
* citrus Id: wmemset.c,v 1.2 2000/12/20 14:08:31 itojun Exp
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: wmemset.c,v 1.2 2005/06/19 22:12:07 espie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c
index 2657adf1421..c1722580859 100644
--- a/lib/libc/sys/ftruncate.c
+++ b/lib/libc/sys/ftruncate.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ftruncate.c,v 1.14 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ftruncate.c,v 1.13 2005/04/06 16:56:45 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <unistd.h>
diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c
index d61c159b20f..f9e9ef98aa3 100644
--- a/lib/libc/sys/lseek.c
+++ b/lib/libc/sys/lseek.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lseek.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lseek.c,v 1.12 2005/04/06 16:56:45 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <unistd.h>
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
index de7fb90b38c..19ec915d7cc 100644
--- a/lib/libc/sys/mmap.c
+++ b/lib/libc/sys/mmap.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mmap.c,v 1.14 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mmap.c,v 1.13 2005/04/06 16:56:45 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/syscall.h>
diff --git a/lib/libc/sys/pread.c b/lib/libc/sys/pread.c
index 5c2bbca33e7..39cedfada10 100644
--- a/lib/libc/sys/pread.c
+++ b/lib/libc/sys/pread.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pread.c,v 1.7 2005/04/06 16:56:45 millert Exp $ */
+/* $OpenBSD: pread.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: pread.c,v 1.7 2005/04/06 16:56:45 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <unistd.h>
diff --git a/lib/libc/sys/preadv.c b/lib/libc/sys/preadv.c
index 3db5a4dad1c..b39e30c3227 100644
--- a/lib/libc/sys/preadv.c
+++ b/lib/libc/sys/preadv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: preadv.c,v 1.7 2005/04/06 16:56:45 millert Exp $ */
+/* $OpenBSD: preadv.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: preadv.c,v 1.7 2005/04/06 16:56:45 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/uio.h>
diff --git a/lib/libc/sys/pwrite.c b/lib/libc/sys/pwrite.c
index c7c02fcddfc..b49d2fdbd55 100644
--- a/lib/libc/sys/pwrite.c
+++ b/lib/libc/sys/pwrite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwrite.c,v 1.7 2005/04/06 16:56:45 millert Exp $ */
+/* $OpenBSD: pwrite.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: pwrite.c,v 1.7 2005/04/06 16:56:45 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <unistd.h>
diff --git a/lib/libc/sys/pwritev.c b/lib/libc/sys/pwritev.c
index d894c8e9722..31192152376 100644
--- a/lib/libc/sys/pwritev.c
+++ b/lib/libc/sys/pwritev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwritev.c,v 1.7 2005/04/06 16:56:45 millert Exp $ */
+/* $OpenBSD: pwritev.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: pwritev.c,v 1.7 2005/04/06 16:56:45 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/uio.h>
diff --git a/lib/libc/sys/semctl.c b/lib/libc/sys/semctl.c
index 64bf75114ab..d3bba9fdb13 100644
--- a/lib/libc/sys/semctl.c
+++ b/lib/libc/sys/semctl.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: semctl.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1994, 1995 Christopher G. Demetriou
* All rights reserved.
@@ -29,10 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: semctl.c,v 1.6 2002/02/19 19:39:37 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/sem.h>
diff --git a/lib/libc/sys/stack_protector.c b/lib/libc/sys/stack_protector.c
index 2379b955993..1f9050f65ce 100644
--- a/lib/libc/sys/stack_protector.c
+++ b/lib/libc/sys/stack_protector.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stack_protector.c,v 1.7 2004/09/14 22:19:30 deraadt Exp $ */
+/* $OpenBSD: stack_protector.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat.
@@ -27,10 +27,6 @@
*
*/
-#if defined(LIBC_SCCS) && !defined(list)
-static char rcsid[] = "$OpenBSD: stack_protector.c,v 1.7 2004/09/14 22:19:30 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <signal.h>
diff --git a/lib/libc/sys/timer_create.c b/lib/libc/sys/timer_create.c
index f588dbd670a..e7abf4196e4 100644
--- a/lib/libc/sys/timer_create.c
+++ b/lib/libc/sys/timer_create.c
@@ -1,6 +1,4 @@
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_create.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
+/* $OpenBSD: timer_create.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
#include <signal.h>
#include <time.h>
diff --git a/lib/libc/sys/timer_delete.c b/lib/libc/sys/timer_delete.c
index 6c45049e8b2..d108d4584d7 100644
--- a/lib/libc/sys/timer_delete.c
+++ b/lib/libc/sys/timer_delete.c
@@ -1,6 +1,4 @@
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_delete.c,v 1.4 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
+/* $OpenBSD: timer_delete.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
#include <signal.h>
#include <time.h>
diff --git a/lib/libc/sys/timer_getoverrun.c b/lib/libc/sys/timer_getoverrun.c
index 2b138ebe163..0f981c25802 100644
--- a/lib/libc/sys/timer_getoverrun.c
+++ b/lib/libc/sys/timer_getoverrun.c
@@ -1,6 +1,4 @@
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_getoverrun.c,v 1.4 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
+/* $OpenBSD: timer_getoverrun.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
#include <signal.h>
#include <time.h>
diff --git a/lib/libc/sys/timer_gettime.c b/lib/libc/sys/timer_gettime.c
index c135299f659..41391bf6b51 100644
--- a/lib/libc/sys/timer_gettime.c
+++ b/lib/libc/sys/timer_gettime.c
@@ -1,6 +1,4 @@
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_gettime.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
+/* $OpenBSD: timer_gettime.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
#include <signal.h>
#include <time.h>
diff --git a/lib/libc/sys/timer_settime.c b/lib/libc/sys/timer_settime.c
index 22fb6dd40ad..f54a642dd6f 100644
--- a/lib/libc/sys/timer_settime.c
+++ b/lib/libc/sys/timer_settime.c
@@ -1,6 +1,4 @@
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_settime.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
+/* $OpenBSD: timer_settime.c,v 1.6 2005/08/08 08:05:38 espie Exp $ */
#include <signal.h>
#include <time.h>
diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c
index 992136283db..960deb6f617 100644
--- a/lib/libc/sys/truncate.c
+++ b/lib/libc/sys/truncate.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: truncate.c,v 1.12 2005/08/08 08:05:38 espie Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -27,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: truncate.c,v 1.11 2005/04/06 16:56:45 millert Exp $";
-#endif /* SYSLIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <unistd.h>
diff --git a/lib/libc/time/asctime.c b/lib/libc/time/asctime.c
index f9b299a0740..1b5b98d5780 100644
--- a/lib/libc/time/asctime.c
+++ b/lib/libc/time/asctime.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: asctime.c,v 1.13 2005/08/08 08:05:38 espie Exp $ */
/*
** This file is in the public domain, so clarified as of
** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
@@ -9,11 +10,6 @@
** whereas the output of asctime is supposed to be constant.
*/
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)asctime.c 7.31";
-static char rcsid[] = "$OpenBSD: asctime.c,v 1.12 2005/07/05 13:40:51 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*LINTLIBRARY*/
#include "private.h"
diff --git a/lib/libc/time/difftime.c b/lib/libc/time/difftime.c
index c9ca9a21fd6..8521a60110c 100644
--- a/lib/libc/time/difftime.c
+++ b/lib/libc/time/difftime.c
@@ -1,13 +1,9 @@
+/* $OpenBSD: difftime.c,v 1.9 2005/08/08 08:05:38 espie Exp $ */
/*
** This file is in the public domain, so clarified as of
** 1996-06-05 by Arthur David Olson.
*/
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)difftime.c 7.19";
-static char rcsid[] = "$OpenBSD: difftime.c,v 1.8 2005/07/19 15:51:29 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*LINTLIBRARY*/
#include "private.h" /* for time_t, TYPE_INTEGRAL, and TYPE_SIGNED */
diff --git a/lib/libc/time/ialloc.c b/lib/libc/time/ialloc.c
index 395f92a8a4f..4de6ab915a6 100644
--- a/lib/libc/time/ialloc.c
+++ b/lib/libc/time/ialloc.c
@@ -1,13 +1,9 @@
+/* $OpenBSD: ialloc.c,v 1.10 2005/08/08 08:05:38 espie Exp $ */
/*
** This file is in the public domain, so clarified as of
** Feb 14, 2003 by Arthur David Olson (arthur_david_olson@nih.gov).
*/
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)ialloc.c 8.29";
-static char rcsid[] = "$OpenBSD: ialloc.c,v 1.9 2005/07/05 13:40:51 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*LINTLIBRARY*/
#include "private.h"
diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c
index f49fca6042c..4de725bbac4 100644
--- a/lib/libc/time/localtime.c
+++ b/lib/libc/time/localtime.c
@@ -1,13 +1,9 @@
+/* $OpenBSD: localtime.c,v 1.27 2005/08/08 08:05:38 espie Exp $ */
/*
** This file is in the public domain, so clarified as of
** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
*/
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)localtime.c 7.95";
-static char rcsid[] = "$OpenBSD: localtime.c,v 1.26 2005/07/05 13:40:51 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu).
** POSIX-style TZ environment variable handling from Guy Harris
diff --git a/lib/libc/time/scheck.c b/lib/libc/time/scheck.c
index 9f44c0724da..f9daef7a4a7 100644
--- a/lib/libc/time/scheck.c
+++ b/lib/libc/time/scheck.c
@@ -1,13 +1,9 @@
+/* $OpenBSD: scheck.c,v 1.8 2005/08/08 08:05:38 espie Exp $ */
/*
** This file is in the public domain, so clarified as of
** Feb 14, 2003 by Arthur David Olson (arthur_david_olson@nih.gov).
*/
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)scheck.c 8.16";
-static char rcsid[] = "$OpenBSD: scheck.c,v 1.7 2005/07/05 13:40:51 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*LINTLIBRARY*/
#include "private.h"
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
index cfa345569f9..58bde890b91 100644
--- a/lib/libc/time/strftime.c
+++ b/lib/libc/time/strftime.c
@@ -1,8 +1,4 @@
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)strftime.c 7.75";
-static char *rcsid = "$OpenBSD: strftime.c,v 1.15 2005/07/05 13:40:51 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
+/* $OpenBSD: strftime.c,v 1.16 2005/08/08 08:05:38 espie Exp $ */
#include "private.h"
/*
diff --git a/lib/libc/time/strptime.c b/lib/libc/time/strptime.c
index 141fc202310..f2f2c27f270 100644
--- a/lib/libc/time/strptime.c
+++ b/lib/libc/time/strptime.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strptime.c,v 1.11 2005/08/08 08:05:38 espie Exp $ */
/* $NetBSD: strptime.c,v 1.12 1998/01/20 21:39:40 mycroft Exp $ */
/*-
@@ -35,10 +36,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: strptime.c,v 1.10 2004/09/15 19:01:58 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/localedef.h>
#include <ctype.h>
#include <locale.h>
diff --git a/lib/libc/time/zdump.c b/lib/libc/time/zdump.c
index 351dc65fa63..99e1ce5a40d 100644
--- a/lib/libc/time/zdump.c
+++ b/lib/libc/time/zdump.c
@@ -1,13 +1,9 @@
+/* $OpenBSD: zdump.c,v 1.17 2005/08/08 08:05:38 espie Exp $ */
/*
** This file is in the public domain, so clarified as of
** Feb 14, 2003 by Arthur David Olson (arthur_david_olson@nih.gov).
*/
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)zdump.c 7.65";
-static char rcsid[] = "$OpenBSD: zdump.c,v 1.16 2005/07/05 13:40:51 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
** This code has been made independent of the rest of the time
** conversion package to increase confidence in the verification it provides.
diff --git a/lib/libc/time/zic.c b/lib/libc/time/zic.c
index 036534f9edd..e3680472aa3 100644
--- a/lib/libc/time/zic.c
+++ b/lib/libc/time/zic.c
@@ -1,13 +1,9 @@
+/* $OpenBSD: zic.c,v 1.25 2005/08/08 08:05:38 espie Exp $ */
/*
** This file is in the public domain, so clarified as of
** Feb 14, 2003 by Arthur David Olson (arthur_david_olson@nih.gov).
*/
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)zic.c 7.124";
-static char rcsid[] = "$OpenBSD: zic.c,v 1.24 2005/07/05 13:40:51 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
** Regardless of the type of time_t, we do our work using this type.
*/