From 5b31cc94b10d4bb7109c6b27940a0fc76a44a331 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 23 Nov 2023 10:59:13 -0700 Subject: [PATCH] sccs: Manual changes For the uncommon items: Go through the tree and remove sccs tags that didn't fit any nice pattern. If in the neighborhood, other SCM tags were removed when they were detritis of long-ago CVS somehow in the early mists of the project. Some adjacent copyrights stringswere removed (they duplicated the copyright notices in the file). This also removed non-standard formations of omission of SCCS tags (usually by adding an extra #if 0 somewhere. After this commit, a number of strings tagged with the 'what' @(#) prefix remain, but they are primarily copyright notices. Sponsored by: Netflix --- include/rpc/rpcb_prot.x | 2 -- include/rpcsvc/bootparam_prot.x | 6 ------ include/rpcsvc/crypt.x | 4 ---- include/rpcsvc/key_prot.x | 4 ---- include/rpcsvc/klm_prot.x | 8 -------- include/rpcsvc/mount.x | 8 -------- include/rpcsvc/nfs_prot.x | 8 -------- include/rpcsvc/nis.x | 4 ---- include/rpcsvc/nis_cache.x | 4 ---- include/rpcsvc/nis_callback.x | 4 ---- include/rpcsvc/nlm_prot.x | 8 +------- include/rpcsvc/pmap_prot.x | 3 --- include/rpcsvc/rex.x | 8 -------- include/rpcsvc/rnusers.x | 8 -------- include/rpcsvc/rquota.x | 4 ---- include/rpcsvc/rstat.x | 7 ------- include/rpcsvc/rwall.x | 2 -- include/rpcsvc/sm_inter.x | 4 ---- include/rpcsvc/spray.x | 8 -------- include/rpcsvc/yp.x | 4 ---- include/rpcsvc/yppasswd.x | 8 -------- include/rpcsvc/ypupdate_prot.x | 1 - kerberos5/include/config.h | 3 +-- lib/libc/db/docs/hash.usenix.ps | Bin 158707 -> 158679 bytes lib/libc/db/docs/libtp.usenix.ps | Bin 168137 -> 168109 bytes lib/libc/rpc/clnt_bcast.c | 3 --- lib/libc/rpc/clnt_dg.c | 3 --- lib/libc/rpc/svc_auth.c | 3 --- lib/libc/rpc/svc_generic.c | 3 --- lib/libc/string/wcscmp.c | 10 +++------- lib/libc/string/wcsncmp.c | 9 ++------- sbin/fsck/preen.c | 9 +-------- sbin/ipf/ipf/bpf_filter.c | 5 ----- sbin/ipf/ipsend/ip.c | 4 ---- sbin/ipf/ipsend/ipresend.c | 4 ---- sbin/ipf/ipsend/iptest.c | 4 ---- sbin/ipf/ipsend/iptests.c | 4 ---- sbin/mount_cd9660/mount_cd9660.c | 12 ------------ sbin/quotacheck/preen.c | 9 +-------- sbin/rcorder/hash.c | 13 ------------- sys/amd64/linux/syscalls.master | 1 - sys/amd64/linux32/syscalls.master | 1 - sys/i386/linux/syscalls.master | 1 - sys/kern/syscalls.master | 2 -- sys/libkern/arm/muldi3.c | 8 -------- sys/rpc/clnt_dg.c | 4 ---- sys/rpc/svc_auth.c | 4 ---- sys/rpc/svc_generic.c | 4 ---- usr.bin/compress/doc/README | 3 --- usr.bin/cut/cut.c | 7 ------- usr.bin/factor/factor.c | 14 -------------- usr.bin/find/option.c | 4 ---- usr.bin/rpcgen/rpc_clntout.c | 7 ------- usr.bin/rpcgen/rpc_cout.c | 7 ------- usr.bin/rpcgen/rpc_hout.c | 7 ------- usr.bin/rpcgen/rpc_main.c | 7 ------- usr.bin/rpcgen/rpc_parse.c | 7 ------- usr.bin/rpcgen/rpc_sample.c | 1 - usr.bin/rpcgen/rpc_scan.c | 7 ------- usr.bin/rpcgen/rpc_svcout.c | 7 ------- usr.bin/rpcgen/rpc_tblout.c | 7 ------- usr.bin/rpcgen/rpc_util.c | 7 ------- usr.bin/systat/tcp.c | 9 --------- usr.sbin/rpc.lockd/test.c | 8 -------- 64 files changed, 9 insertions(+), 340 deletions(-) diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x index b5de5c6d865de6..efbe8f4ba24683 100644 --- a/include/rpc/rpcb_prot.x +++ b/include/rpc/rpcb_prot.x @@ -33,8 +33,6 @@ #ifdef RPC_HDR % -%/* #pragma ident "@(#)rpcb_prot.x 1.5 94/04/29 SMI" */ -% %#ifndef _KERNEL % #endif diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x index 6e47bdb218d372..51d315327a00e8 100644 --- a/include/rpcsvc/bootparam_prot.x +++ b/include/rpcsvc/bootparam_prot.x @@ -45,12 +45,6 @@ %#include %#include %#include -#else -%#ifndef lint -%/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include #endif const MAX_MACHINE_NAME = 255; diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x index 7d6b94d960674e..63e4c879815299 100644 --- a/include/rpcsvc/crypt.x +++ b/include/rpcsvc/crypt.x @@ -30,10 +30,6 @@ * SUCH DAMAGE. */ -#ifndef RPC_HDR -%#include -#endif - /* * This protocol definition exists because of the U.S. government and * its stupid export laws. We can't export DES code from the United diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x index 09a20049832ef6..9143b979f16f5d 100644 --- a/include/rpcsvc/key_prot.x +++ b/include/rpcsvc/key_prot.x @@ -45,10 +45,6 @@ * requirements. */ -%/* From: #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */ -%/* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ -%#include -% %/* % * Compiled from key_prot.x using rpcgen. % * DO NOT EDIT THIS FILE! diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x index b78dbfc20c3c10..4dcfa00aab2457 100644 --- a/include/rpcsvc/klm_prot.x +++ b/include/rpcsvc/klm_prot.x @@ -38,14 +38,6 @@ * above the kernel. */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const LM_MAXSTRLEN = 1024; /* diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x index e67cbc73d86779..b3a4e11aa2c700 100644 --- a/include/rpcsvc/mount.x +++ b/include/rpcsvc/mount.x @@ -33,14 +33,6 @@ * Protocol description for the mount program */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */ const MNTNAMLEN = 255; /* maximum bytes in a name argument */ const FHSIZE = 32; /* size in bytes of a file handle */ diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x index 9706c5a03bbd5b..99ac2fd68e8515 100644 --- a/include/rpcsvc/nfs_prot.x +++ b/include/rpcsvc/nfs_prot.x @@ -29,14 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const NFS_PORT = 2049; const NFS_MAXDATA = 8192; const NFS_MAXPATHLEN = 1024; diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x index e83784159fe5d0..07a9c48e7638f8 100644 --- a/include/rpcsvc/nis.x +++ b/include/rpcsvc/nis.x @@ -29,10 +29,6 @@ % * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. % */ -#ifndef RPC_HDR -%#include -#endif - /* * * RPC Language Protocol description file for NIS Plus diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x index c728736e3213c5..2b204f617b2992 100644 --- a/include/rpcsvc/nis_cache.x +++ b/include/rpcsvc/nis_cache.x @@ -35,10 +35,6 @@ * All Rights Reserved. */ -#ifndef RPC_HDR -%#include -#endif - #ifdef RPC_HDR %#include %#include diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x index af7a291d1baaf5..3e74bbca50cd85 100644 --- a/include/rpcsvc/nis_callback.x +++ b/include/rpcsvc/nis_callback.x @@ -36,10 +36,6 @@ * All Rights Reserved. */ -#ifndef RPC_HDR -%#include -#endif - /* * * RPCL description of the Callback Service. diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x index f53d819968010d..a8581ce9da0d37 100644 --- a/include/rpcsvc/nlm_prot.x +++ b/include/rpcsvc/nlm_prot.x @@ -8,14 +8,8 @@ #ifdef RPC_HDR %#define LM_MAXSTRLEN 1024 %#define MAXNAMELEN LM_MAXSTRLEN+1 -#else -%#include -%#ifndef lint -%/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $"); -%#endif /* not lint */ #endif +/* $NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $ */ /* * status of a call to the lock manager diff --git a/include/rpcsvc/pmap_prot.x b/include/rpcsvc/pmap_prot.x index fb8a3bbde04487..d64bfc3cf73aca 100644 --- a/include/rpcsvc/pmap_prot.x +++ b/include/rpcsvc/pmap_prot.x @@ -34,9 +34,6 @@ #ifdef RPC_HDR % -%#pragma ident "@(#)pmap_prot.x 1.6 94/04/29 SMI" -%#include -% %#ifndef _KERNEL % #endif diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x index 20cce24e0ffa6e..78003204df0f86 100644 --- a/include/rpcsvc/rex.x +++ b/include/rpcsvc/rex.x @@ -33,14 +33,6 @@ * Remote execution (rex) protocol specification */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const STRINGSIZE = 1024; typedef string rexstring<1024>; diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x index 1b6dcada2ff101..3e2a426b6b9f3e 100644 --- a/include/rpcsvc/rnusers.x +++ b/include/rpcsvc/rnusers.x @@ -33,14 +33,6 @@ * Find out about remote users */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const MAXUSERS = 100; const MAXUTLEN = 256; diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x index 31cf2f31e856c0..6349c35413d35d 100644 --- a/include/rpcsvc/rquota.x +++ b/include/rpcsvc/rquota.x @@ -3,10 +3,6 @@ * Requires unix authentication */ -#ifndef RPC_HDR -%#include -#endif - const RQ_PATHLEN = 1024; struct sq_dqblk { diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x index 1b62470777e8f0..17e9c9fedf3aa3 100644 --- a/include/rpcsvc/rstat.x +++ b/include/rpcsvc/rstat.x @@ -44,13 +44,6 @@ % %#endif /* ndef FSCALE */ -#else - -%#ifndef lint -%/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include #endif /* def RPC_HDR */ const RSTAT_CPUSTATES = 4; diff --git a/include/rpcsvc/rwall.x b/include/rpcsvc/rwall.x index 6c26c1f18f3e34..0c3a989ede0f9f 100644 --- a/include/rpcsvc/rwall.x +++ b/include/rpcsvc/rwall.x @@ -31,8 +31,6 @@ %/* % * Copyright (c) 1984, 1990 by Sun Microsystems, Inc. % */ -% -%/* from @(#)rwall.x 1.6 91/03/11 TIRPC 1.0 */ #ifdef RPC_HDR % diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index 89c51ca1b5431f..14aaeadee8a702 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -35,10 +35,6 @@ * */ -#ifndef RPC_HDR -%#include -#endif - program SM_PROG { version SM_VERS { /* res_stat = stat_succ if status monitor agrees to monitor */ diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x index 406d318a494355..8ef42f972c440e 100644 --- a/include/rpcsvc/spray.x +++ b/include/rpcsvc/spray.x @@ -34,14 +34,6 @@ * Useful for testing flakiness of network interfaces */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const SPRAYMAX = 8845; /* max amount can spray */ /* diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index 3567e2bd3fadfd..fff06557b67e54 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -33,10 +33,6 @@ * Protocol description file for the Yellow Pages Service */ -#ifndef RPC_HDR -%#include -#endif - const YPMAXRECORD = 16777216; const YPMAXDOMAIN = 64; const YPMAXMAP = 64; diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index 2ad2215689f385..15741f37b27d30 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -34,14 +34,6 @@ * Requires unix authentication */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - program YPPASSWDPROG { version YPPASSWDVERS { /* diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x index 328a07432f0d08..b989ad29468b30 100644 --- a/include/rpcsvc/ypupdate_prot.x +++ b/include/rpcsvc/ypupdate_prot.x @@ -32,7 +32,6 @@ % * Copyright (c) 1986, 1990 by Sun Microsystems, Inc. % */ % -%/* from @(#)ypupdate_prot.x 1.3 91/03/11 TIRPC 1.0 */ #ifndef RPC_HDR %#include #endif diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h index 7d8e1008c84f04..d08f9d881ce072 100644 --- a/kerberos5/include/config.h +++ b/kerberos5/include/config.h @@ -3,8 +3,7 @@ #ifndef RCSID -#define RCSID(msg) \ -static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } +#define RCSID(msg) #endif /* Maximum values on all known systems */ diff --git a/lib/libc/db/docs/hash.usenix.ps b/lib/libc/db/docs/hash.usenix.ps index e050cdeba59fe0aae31b62e20c6ad0da7fe050e4..98adfdf209b52e26a96a4a4313273ea719f5fd22 100644 GIT binary patch delta 18 acmex-o%8y2&Iywm*R`%=+`5j*H5&k7DG4P2 delta 45 zcmcb9o%8c`&IyyGI2|;UH4BPUGE4Ldit;%P^^6rv^bJk*Ei4)*v`%2$I)TYO8vuRd B4{87a diff --git a/lib/libc/db/docs/libtp.usenix.ps b/lib/libc/db/docs/libtp.usenix.ps index 57df42730902312c418d6bbb2869c0f98bce61ce..2ec31308cb0e35937af22e6f4d16c5e5b6b9e172 100644 GIT binary patch delta 18 acmX@PkZbKit_hPG*R`%=+`5iQdIA7dBM4#u delta 45 zcmZ3xkn7|^t_hQ*I2|;UH4BPUGE4Ldit;%P^^6rv^bJk*Ei4)*v`%2$I)O=c0svjp B4yOPB diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c index 17b5027700f433..07e6d0a0fa20e5 100644 --- a/lib/libc/rpc/clnt_bcast.c +++ b/lib/libc/rpc/clnt_bcast.c @@ -33,9 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro"; -#endif /* * clnt_bcast.c * Client interface to broadcast service. diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c index ca31d3104b6c0e..78fc5e47d44412 100644 --- a/lib/libc/rpc/clnt_dg.c +++ b/lib/libc/rpc/clnt_dg.c @@ -33,9 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro"; -#endif /* * Implements a connectionless client side RPC. */ diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c index 6d9265e8c0f7a3..eb61171733d654 100644 --- a/lib/libc/rpc/svc_auth.c +++ b/lib/libc/rpc/svc_auth.c @@ -33,9 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; -#endif /* * svc_auth.c, Server-side rpc authenticator interface. * diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c index eb7ed28bb0cafd..ea08811ba1ae16 100644 --- a/lib/libc/rpc/svc_generic.c +++ b/lib/libc/rpc/svc_generic.c @@ -34,9 +34,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro"; -#endif /* * svc_generic.c, Server side for RPC. * diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c index ed02db7717041f..66e08ff782a73a 100644 --- a/lib/libc/string/wcscmp.c +++ b/lib/libc/string/wcscmp.c @@ -32,13 +32,9 @@ * SUCH DAMAGE. */ -#include -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93"; -#if 0 -__RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ + +/* $NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $ */ + #include /* diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c index a7b2189d5fb938..141e42c3087f94 100644 --- a/lib/libc/string/wcsncmp.c +++ b/lib/libc/string/wcsncmp.c @@ -29,13 +29,8 @@ * SUCH DAMAGE. */ -#include -#if 0 -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93"; -__RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $"); -#endif /* LIBC_SCCS and not lint */ -#endif +/* $NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $ */ + #include int diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c index 219b2a91e0e222..574826f4d8f04e 100644 --- a/sbin/fsck/preen.c +++ b/sbin/fsck/preen.c @@ -31,14 +31,7 @@ * SUCH DAMAGE. */ -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)preen.c 8.5 (Berkeley) 4/28/95"; -#else -__RCSID("$NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $"); -#endif -#endif /* not lint */ +/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */ #include #include diff --git a/sbin/ipf/ipf/bpf_filter.c b/sbin/ipf/ipf/bpf_filter.c index b380eb8e20ee5d..bd7012d2f1ab63 100644 --- a/sbin/ipf/ipf/bpf_filter.c +++ b/sbin/ipf/ipf/bpf_filter.c @@ -37,11 +37,6 @@ * SUCH DAMAGE. */ -#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) -static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.3 2006/10/03 11:25:56 darrenr Exp $ (LBL)"; -#endif - #include #include #include diff --git a/sbin/ipf/ipsend/ip.c b/sbin/ipf/ipsend/ip.c index 14197c38226034..177563e65c9cd3 100644 --- a/sbin/ipf/ipsend/ip.c +++ b/sbin/ipf/ipsend/ip.c @@ -4,10 +4,6 @@ * * See the IPFILTER.LICENCE file for details on licencing. */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995"; -static const char rcsid[] = "@(#)$Id$"; -#endif #include #include #include diff --git a/sbin/ipf/ipsend/ipresend.c b/sbin/ipf/ipsend/ipresend.c index be7b5bc1943a2e..c00367a4a586a0 100644 --- a/sbin/ipf/ipsend/ipresend.c +++ b/sbin/ipf/ipsend/ipresend.c @@ -5,10 +5,6 @@ * See the IPFILTER.LICENCE file for details on licencing. * */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id$"; -#endif #include #include #include diff --git a/sbin/ipf/ipsend/iptest.c b/sbin/ipf/ipsend/iptest.c index 16b97c221f4155..db31168cd380e3 100644 --- a/sbin/ipf/ipsend/iptest.c +++ b/sbin/ipf/ipsend/iptest.c @@ -5,10 +5,6 @@ * See the IPFILTER.LICENCE file for details on licencing. * */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id$"; -#endif #include #include #include diff --git a/sbin/ipf/ipsend/iptests.c b/sbin/ipf/ipsend/iptests.c index 3fccf1389f6c2e..1015e74a32547b 100644 --- a/sbin/ipf/ipsend/iptests.c +++ b/sbin/ipf/ipsend/iptests.c @@ -5,10 +5,6 @@ * See the IPFILTER.LICENCE file for details on licencing. * */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id$"; -#endif #include #include #if defined(__NetBSD__) && defined(__vax__) diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index 0699c680211460..ab6da7271c170f 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -34,18 +34,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1992, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -/* -static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95"; -*/ -#endif /* not lint */ - #include #include #include diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c index 6013eb9d5ffc2f..b7bd79a462d7dc 100644 --- a/sbin/quotacheck/preen.c +++ b/sbin/quotacheck/preen.c @@ -31,14 +31,7 @@ * SUCH DAMAGE. */ -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)preen.c 8.5 (Berkeley) 4/28/95"; -#else -__RCSID("$NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $"); -#endif -#endif /* not lint */ +/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */ #include #include diff --git a/sbin/rcorder/hash.c b/sbin/rcorder/hash.c index e2231461f1a948..a40e52529d06eb 100644 --- a/sbin/rcorder/hash.c +++ b/sbin/rcorder/hash.c @@ -40,19 +40,6 @@ * SUCH DAMAGE. */ -#ifdef MAKE_BOOTSTRAP -static char rcsid[] = "$NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $"; -#else -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93"; -#else -__RCSID("$NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $"); -#endif -#endif /* not lint */ -#endif - #include #include diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 8e12a539b87f04..10084b53a1e16e 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -1,5 +1,4 @@ -; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 7d796df1aed3c9..6b40a89db66de3 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1,5 +1,4 @@ -; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux32_sysent.c, linux32_proto.h and linux32_syscall.h. diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index e3c39e50986c2e..d0ba998611535f 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1,5 +1,4 @@ -; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 6692495f0d2d83..63aa8c2a5d7e36 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,5 +1,3 @@ -; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 -; ; System call name/number master file. ; Processed to created init_sysent.c, syscalls.c and syscall.h. diff --git a/sys/libkern/arm/muldi3.c b/sys/libkern/arm/muldi3.c index 21b357d49eb4ea..d41e9b99e08016 100644 --- a/sys/libkern/arm/muldi3.c +++ b/sys/libkern/arm/muldi3.c @@ -35,14 +35,6 @@ * SUCH DAMAGE. */ -#include -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)muldi3.c 8.1 (Berkeley) 6/4/93"; -#else -#endif -#endif /* LIBC_SCCS and not lint */ - #include /* diff --git a/sys/rpc/clnt_dg.c b/sys/rpc/clnt_dg.c index 6d0b4fe5b76e6a..f06f6b034c9a82 100644 --- a/sys/rpc/clnt_dg.c +++ b/sys/rpc/clnt_dg.c @@ -33,10 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro"; -#endif -#include /* * Implements a connectionless client side RPC. */ diff --git a/sys/rpc/svc_auth.c b/sys/rpc/svc_auth.c index 1addbbe7928a4c..6acb1fb0d4b9f3 100644 --- a/sys/rpc/svc_auth.c +++ b/sys/rpc/svc_auth.c @@ -33,10 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; -#endif -#include /* * svc_auth.c, Server-side rpc authenticator interface. * diff --git a/sys/rpc/svc_generic.c b/sys/rpc/svc_generic.c index c5ea544cf8deaa..b2626d66490d5d 100644 --- a/sys/rpc/svc_generic.c +++ b/sys/rpc/svc_generic.c @@ -34,10 +34,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro"; -#endif -#include /* * svc_generic.c, Server side for RPC. * diff --git a/usr.bin/compress/doc/README b/usr.bin/compress/doc/README index 4357c92d5bdadb..cae983721c6f81 100644 --- a/usr.bin/compress/doc/README +++ b/usr.bin/compress/doc/README @@ -1,6 +1,3 @@ - - @(#)README 8.1 (Berkeley) 6/9/93 - Compress version 4.0 improvements over 3.0: o compress() speedup (10-50%) by changing division hash to xor o decompress() speedup (5-10%) diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index 796ab66c0c6eaa..df4a2d7eb132f4 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -32,13 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -static const char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; -#endif /* not lint */ -#include #include #include #include diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c index 53a369f10506c9..9d8fdbe1fb0fd8 100644 --- a/usr.bin/factor/factor.c +++ b/usr.bin/factor/factor.c @@ -30,20 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#include -#ifdef __COPYRIGHT -__COPYRIGHT("@(#) Copyright (c) 1989, 1993\ - The Regents of the University of California. All rights reserved."); -#endif -#ifdef __SCCSID -__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95"); -#endif -#ifdef __RCSID -__RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $"); -#endif -#endif /* not lint */ - /* * factor - factor a number into primes * diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index c5b461f3389b70..4af5af94e3294c 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -/* -static char sccsid[] = "@(#)option.c 8.2 (Berkeley) 4/16/94"; -*/ - #include #include #include diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c index 4162b089761b15..a06ca686a483bf 100644 --- a/usr.bin/rpcgen/rpc_clntout.c +++ b/usr.bin/rpcgen/rpc_clntout.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler * Copyright (C) 1987, Sun Microsytsems, Inc. diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c index 284a0f61d7630e..8c286484785080 100644 --- a/usr.bin/rpcgen/rpc_cout.c +++ b/usr.bin/rpcgen/rpc_cout.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_cout.c, XDR routine outputter for the RPC protocol compiler * Copyright (C) 1987, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c index 927075823ced1c..9c298930fa93f4 100644 --- a/usr.bin/rpcgen/rpc_hout.c +++ b/usr.bin/rpcgen/rpc_hout.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_hout.c, Header file outputter for the RPC protocol compiler * Copyright (C) 1987, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c index 1b2e01905a4049..8d5afad86cff05 100644 --- a/usr.bin/rpcgen/rpc_main.c +++ b/usr.bin/rpcgen/rpc_main.c @@ -28,13 +28,6 @@ */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_main.c, Top level of the RPC protocol compiler. * Copyright (C) 1987, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c index ea0d377a927c21..8fa84230beb27b 100644 --- a/usr.bin/rpcgen/rpc_parse.c +++ b/usr.bin/rpcgen/rpc_parse.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_parse.c, Parser for the RPC protocol compiler * Copyright (C) 1987 Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c index e02c1cdd505d68..783fb0d0103129 100644 --- a/usr.bin/rpcgen/rpc_sample.c +++ b/usr.bin/rpcgen/rpc_sample.c @@ -27,7 +27,6 @@ * Mountain View, California 94043 */ -#include /* * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler * Copyright (C) 1987, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c index a9ea666bf44fe1..d805a1f983a5b0 100644 --- a/usr.bin/rpcgen/rpc_scan.c +++ b/usr.bin/rpcgen/rpc_scan.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_scan.c, Scanner for the RPC protocol compiler * Copyright (C) 1987, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c index dc330fc7eb27a6..2c6849714d7570 100644 --- a/usr.bin/rpcgen/rpc_svcout.c +++ b/usr.bin/rpcgen/rpc_svcout.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler * Copyright (C) 1987, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c index 823826805d0f2d..dfa4cd8656eb28 100644 --- a/usr.bin/rpcgen/rpc_tblout.c +++ b/usr.bin/rpcgen/rpc_tblout.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI"; -#endif -#endif - -#include /* * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler * Copyright (C) 1989, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c index 56265ec7b78c5b..25e4963085b443 100644 --- a/usr.bin/rpcgen/rpc_util.c +++ b/usr.bin/rpcgen/rpc_util.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_util.c, Utility routines for the RPC protocol compiler * Copyright (C) 1989, Sun Microsystems, Inc. diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c index 935a138be8e7d0..6f90efcf53b3a9 100644 --- a/usr.bin/systat/tcp.c +++ b/usr.bin/systat/tcp.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -/* From: */ -static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; -static const char rcsid[] = - "Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp"; -#endif /* not lint */ -#endif - #include #include #include diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c index 87449e3219e562..9a772cfefb2da8 100644 --- a/usr.sbin/rpc.lockd/test.c +++ b/usr.sbin/rpc.lockd/test.c @@ -3,14 +3,6 @@ #include #include #include -#ifndef lint -#if 0 -static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro"; -static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC"; -#else -__RCSID("$NetBSD: test.c,v 1.2 1997/10/18 04:01:21 lukem Exp $"); -#endif -#endif /* not lint */ /* Default timeout can be changed using clnt_control() */ static struct timeval TIMEOUT = { 0, 0 };