From nobody Mon Nov 27 05:24:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD70qfMz51hH0; Mon, 27 Nov 2023 05:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvD64jKtz4WvG; Mon, 27 Nov 2023 05:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5/NM+Ixd2NFeYuKrJDLxCcARM/EfCHddwBNdG+9l4co=; b=kRetUqAxjVdpWIzBRHx0gk8CFIi5ZPl4hvkj2rSXf+gkCBBvjOurj9G0D3vGURyg4a3nzr IKjPI7B9MF5IJDSFA1A+8VJ43pvAenLM4KEJKVDm8hEyYy2XCYPkd0wi4qsb2m3n5iqQ4p GWvg+gDLFsug4DxzkhlNBI/5vjkuzUyw1lUxjdSmx12jH0VUHv7FZJPaRuOioAr4MJe/2U FkSahD+8mYttTwMA31jFaktgGiqhYoo4PmuXxGwIb5Cww52jATe/ZxbZ6H/+0KAP8XUd+N mP65hn/PsXREqAEGNWbBbTykMRiRHO7Z3nioSSZmWv7H/lrt6sCmqUvImhU/BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5/NM+Ixd2NFeYuKrJDLxCcARM/EfCHddwBNdG+9l4co=; b=yFmpGanqeV1+AriIhWvBBlndAsXhYCBiwBMKuyyjmQ+6TyVj167It8TxpoYCQ9dmaFaYjT H4DUsp9UKiZZL68gZiXJA24UR5LZAcY1o5NWvhIJ3gyabFL23ebUGYKubiY5QT2rgK1ubX 7aJNLQsc15qAmTUZQZXKAkx56Y0GW0SzE3S0UJVU1AthqdpEC/vM230AN1vee5MByvFwhV MJvLlOe7JvW6CdMjQwFDX9cJG6DbDMaR6dwyRS0RPaZsh7qJ/x9FbmAw9DgTek46j9CtL4 MFd6nu+EIGiR7b2n6VYStWoM7wOQ1U6uZ405UE62Fj9QT40DJ8LCrApwb2z4ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062694; a=rsa-sha256; cv=none; b=h/jH7BMEeoEUJKnhndzyH4qPBEL9IWzp1S8AAz6n9kp2BBW3w8+oVH6/isR0Lv/P15M0kk V98SzYnrtzqUyssfT57E8p1oCdubRcC3jwQQm5MTm/gfjq1jIndJXsK5p0Uni2FO7azAjo pSJYEx9T2aAYpgSOzUODw9yoK+CKyL3gaYa3lthiPuR2MddnfqIAIv5a8d1C3mH7wHi6+9 cOPHuOxa+jAajqoRthRrTWGsZN8AwDgQm06QZNS3CKRgYfMG0sFVSKxctWuNjl9XCUc5f9 POrVBDPBCfvF4lHycNxSRRnCckHombwWDPWWesSR4wGklIQg87uM5blk1c0awA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD63nY2zB7R; Mon, 27 Nov 2023 05:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR5Osdv066237; Mon, 27 Nov 2023 05:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Osad066234; Mon, 27 Nov 2023 05:24:54 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:54 GMT Message-Id: <202311270524.3AR5Osad066234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5b31cc94b10d - main - sccs: Manual changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b31cc94b10d4bb7109c6b27940a0fc76a44a331 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b31cc94b10d4bb7109c6b27940a0fc76a44a331 commit 5b31cc94b10d4bb7109c6b27940a0fc76a44a331 Author: Warner Losh AuthorDate: 2023-11-23 17:59:13 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:58 +0000 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 | 1 - lib/libc/db/docs/libtp.usenix.ps | 1 - 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(+), 342 deletions(-) diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x index b5de5c6d865d..efbe8f4ba246 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 6e47bdb218d3..51d315327a00 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 7d6b94d96067..63e4c8798152 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 09a20049832e..9143b979f16f 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 b78dbfc20c3c..4dcfa00aab24 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 e67cbc73d867..b3a4e11aa2c7 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 9706c5a03bbd..99ac2fd68e85 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 e83784159fe5..07a9c48e7638 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 c728736e3213..2b204f617b29 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 af7a291d1baa..3e74bbca50cd 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 f53d81996801..a8581ce9da0d 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 fb8a3bbde044..d64bfc3cf73a 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 20cce24e0ffa..78003204df0f 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 1b6dcada2ff1..3e2a426b6b9f 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 31cf2f31e856..6349c35413d3 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 1b62470777e8..17e9c9fedf3a 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 6c26c1f18f3e..0c3a989ede0f 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 89c51ca1b543..14aaeadee8a7 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 406d318a4943..8ef42f972c44 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 3567e2bd3fad..fff06557b67e 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 2ad2215689f3..15741f37b27d 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 328a07432f0d..b989ad29468b 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 7d8e1008c84f..d08f9d881ce0 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 e050cdeba59f..98adfdf209b5 100644 --- a/lib/libc/db/docs/hash.usenix.ps +++ b/lib/libc/db/docs/hash.usenix.ps @@ -3,7 +3,6 @@ %%Title: stdin (ditroff) %%CreationDate: Tue Dec 11 15:06:45 1990 %%EndComments -% @(#)psdit.pro 1.3 4/15/88 % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 diff --git a/lib/libc/db/docs/libtp.usenix.ps b/lib/libc/db/docs/libtp.usenix.ps index 57df42730902..2ec31308cb0e 100644 --- a/lib/libc/db/docs/libtp.usenix.ps +++ b/lib/libc/db/docs/libtp.usenix.ps @@ -3,7 +3,6 @@ %%Title: stdin (ditroff) %%CreationDate: Thu Dec 12 15:32:11 1991 %%EndComments -% @(#)psdit.pro 1.3 4/15/88 % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c index 17b5027700f4..07e6d0a0fa20 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 ca31d3104b6c..78fc5e47d444 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 6d9265e8c0f7..eb61171733d6 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 eb7ed28bb0ca..ea08811ba1ae 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 ed02db771704..66e08ff782a7 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 a7b2189d5fb9..141e42c3087f 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 219b2a91e0e2..574826f4d8f0 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 b380eb8e20ee..bd7012d2f1ab 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 14197c382260..177563e65c9c 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 be7b5bc1943a..c00367a4a586 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 16b97c221f41..db31168cd380 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 3fccf1389f6c..1015e74a3254 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 0699c6802114..ab6da7271c17 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 6013eb9d5ffc..b7bd79a462d7 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 e2231461f1a9..a40e52529d06 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 8e12a539b87f..10084b53a1e1 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 7d796df1aed3..6b40a89db66d 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 e3c39e50986c..d0ba99861153 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 6692495f0d2d..63aa8c2a5d7e 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 21b357d49eb4..d41e9b99e080 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 6d0b4fe5b76e..f06f6b034c9a 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 1addbbe7928a..6acb1fb0d4b9 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 c5ea544cf8de..b2626d66490d 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 4357c92d5bda..cae983721c6f 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 796ab66c0c6e..df4a2d7eb132 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 53a369f10506..9d8fdbe1fb0f 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 c5b461f3389b..4af5af94e329 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 4162b089761b..a06ca686a483 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 284a0f61d763..8c2864847850 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 927075823ced..9c298930fa93 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 1b2e01905a40..8d5afad86cff 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"; *** 148 LINES SKIPPED ***