git: eba230afba49 - main - Purge more stray embedded $FreeBSD$ strings
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 25 Sep 2023 14:58:16 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=eba230afba4932f02a1ca44efc797cf7499a5cb0
commit eba230afba4932f02a1ca44efc797cf7499a5cb0
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-09-25 14:54:56 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-09-25 14:54:56 +0000
Purge more stray embedded $FreeBSD$ strings
These do not use __FBSDID but instead use bare char arrays.
Reviewed by: imp, emaste
Differential Revision: https://reviews.freebsd.org/D41957
---
lib/lib80211/lib80211_regdomain.c | 3 ---
lib/libc/net/nslexer.l | 6 ------
lib/libc/powerpc/gen/syncicache.c | 5 -----
lib/libc/powerpc64/gen/syncicache.c | 5 -----
lib/msun/src/e_sqrtf.c | 4 ----
lib/msun/src/s_modf.c | 4 ----
lib/msun/src/w_cabsf.c | 5 -----
libexec/atrun/atrun.c | 5 -----
libexec/atrun/gloadavg.c | 5 -----
libexec/atrun/gloadavg.h | 3 ---
libexec/comsat/comsat.c | 2 --
libexec/fingerd/fingerd.c | 2 --
libexec/getty/init.c | 2 --
libexec/getty/subr.c | 2 --
libexec/mknetid/hash.c | 5 -----
libexec/mknetid/mknetid.c | 5 -----
libexec/mknetid/parse_group.c | 2 --
libexec/rbootd/bpf.c | 2 --
libexec/rbootd/conf.c | 2 --
libexec/rbootd/parseconf.c | 2 --
libexec/rbootd/rmpproto.c | 2 --
libexec/rbootd/utils.c | 2 --
libexec/revnetgroup/hash.c | 5 -----
libexec/revnetgroup/parse_netgroup.c | 5 -----
libexec/revnetgroup/revnetgroup.c | 5 -----
libexec/rpc.rstatd/rstat_proc.c | 2 --
libexec/rpc.rstatd/rstatd.c | 5 -----
libexec/rpc.rusersd/rusers_proc.c | 5 -----
libexec/rpc.rusersd/rusersd.c | 5 -----
libexec/rpc.sprayd/sprayd.c | 5 -----
libexec/rtld-elf/rtld_malloc.c | 1 -
libexec/talkd/announce.c | 2 --
libexec/talkd/print.c | 2 --
libexec/talkd/process.c | 2 --
libexec/talkd/table.c | 2 --
libexec/talkd/talkd.c | 2 --
sbin/dump/dumprmt.c | 2 --
sbin/dump/itime.c | 2 --
sbin/dump/main.c | 2 --
sbin/dump/optr.c | 2 --
sbin/dump/tape.c | 2 --
sbin/dump/traverse.c | 2 --
sbin/dump/unctime.c | 2 --
sbin/dumpfs/dumpfs.c | 2 --
sbin/ffsinfo/ffsinfo.c | 5 -----
sbin/fsck_msdosfs/boot.c | 2 --
sbin/fsck_msdosfs/check.c | 2 --
sbin/fsck_msdosfs/dir.c | 2 --
sbin/fsck_msdosfs/fat.c | 2 --
sbin/fsck_msdosfs/main.c | 2 --
sbin/fsdb/fsdb.c | 5 -----
sbin/fsdb/fsdbutil.c | 5 -----
sbin/fsirand/fsirand.c | 5 -----
sbin/growfs/debug.c | 5 -----
sbin/ifconfig/af_inet.c | 5 -----
sbin/ifconfig/af_inet6.c | 5 -----
sbin/ifconfig/af_link.c | 5 -----
sbin/ifconfig/af_nd6.c | 5 -----
sbin/ifconfig/ifbridge.c | 5 -----
sbin/ifconfig/ifclone.c | 5 -----
sbin/ifconfig/ifconfig.c | 2 --
sbin/ifconfig/ifgif.c | 5 -----
sbin/ifconfig/ifgroup.c | 5 -----
sbin/ifconfig/iflagg.c | 5 -----
sbin/ifconfig/ifvlan.c | 5 -----
sbin/ifconfig/sfp.c | 5 -----
sbin/init/init.c | 2 --
sbin/mknod/mknod.c | 2 --
sbin/mount/mount_fs.c | 2 --
sbin/mount_cd9660/mount_cd9660.c | 2 --
sbin/mount_msdosfs/mount_msdosfs.c | 5 -----
sbin/mount_nullfs/mount_nullfs.c | 2 --
sbin/mount_unionfs/mount_unionfs.c | 3 ---
sbin/newfs_msdos/mkfs_msdos.c | 5 -----
sbin/newfs_msdos/newfs_msdos.c | 5 -----
sbin/nos-tun/nos-tun.c | 5 -----
sbin/restore/dirs.c | 2 --
sbin/restore/symtab.c | 2 --
sbin/restore/utilities.c | 2 --
sbin/umount/umount.c | 2 --
stand/libsa/powerpc/syncicache.c | 5 -----
sys/netpfil/ipfilter/netinet/fil.c | 1 -
sys/netpfil/ipfilter/netinet/ip_auth.c | 1 -
sys/netpfil/ipfilter/netinet/ip_frag.c | 1 -
sys/netpfil/ipfilter/netinet/ip_nat.c | 1 -
usr.bin/locate/locate/locate.c | 2 --
usr.bin/mktemp/mktemp.c | 5 -----
usr.bin/morse/morse.c | 2 --
usr.bin/nfsstat/nfsstat.c | 2 --
usr.bin/number/number.c | 2 --
usr.bin/primes/pattern.c | 2 --
usr.bin/primes/pr_tbl.c | 2 --
usr.bin/primes/primes.c | 2 --
usr.bin/printf/printf.c | 2 --
usr.bin/showmount/showmount.c | 2 --
usr.bin/tee/tee.c | 2 --
usr.bin/time/time.c | 2 --
usr.bin/truncate/truncate.c | 3 ---
usr.bin/ul/ul.c | 2 --
usr.bin/uniq/uniq.c | 2 --
usr.bin/units/units.c | 5 -----
usr.bin/yes/yes.c | 2 --
usr.sbin/apmd/apmd.c | 5 -----
usr.sbin/btxld/btxld.c | 5 -----
usr.sbin/ckdist/ckdist.c | 5 -----
usr.sbin/config/main.cc | 2 --
usr.sbin/config/mkheaders.c | 2 --
usr.sbin/config/mkmakefile.cc | 2 --
usr.sbin/config/mkoptions.cc | 2 --
usr.sbin/flowctl/flowctl.c | 5 -----
usr.sbin/keyserv/crypt_server.c | 5 -----
usr.sbin/keyserv/keyserv.c | 2 --
usr.sbin/keyserv/setkey.c | 2 --
usr.sbin/mptable/mptable.c | 5 -----
usr.sbin/nfsd/nfsd.c | 2 --
usr.sbin/pciconf/cap.c | 5 -----
usr.sbin/pciconf/err.c | 5 -----
usr.sbin/pciconf/pciconf.c | 5 -----
usr.sbin/pw/bitmap.c | 5 -----
usr.sbin/pw/cpdir.c | 5 -----
usr.sbin/pw/grupd.c | 5 -----
usr.sbin/pw/psdate.c | 5 -----
usr.sbin/pw/pw.c | 5 -----
usr.sbin/pw/pw_conf.c | 5 -----
usr.sbin/pw/pw_group.c | 5 -----
usr.sbin/pw/pw_log.c | 5 -----
usr.sbin/pw/pw_nis.c | 5 -----
usr.sbin/pw/pw_user.c | 5 -----
usr.sbin/pw/pw_vpw.c | 5 -----
usr.sbin/pw/pwupd.c | 5 -----
usr.sbin/pw/rm_r.c | 5 -----
usr.sbin/rpc.lockd/test.c | 1 -
usr.sbin/rpc.statd/test.c | 5 -----
usr.sbin/rpc.umntall/rpc.umntall.c | 5 -----
usr.sbin/rpc.ypupdated/update.c | 2 --
usr.sbin/spray/spray.c | 5 -----
usr.sbin/traceroute6/traceroute6.c | 2 --
usr.sbin/vidcontrol/decode.c | 5 -----
usr.sbin/vidcontrol/vidcontrol.c | 5 -----
139 files changed, 476 deletions(-)
diff --git a/lib/lib80211/lib80211_regdomain.c b/lib/lib80211/lib80211_regdomain.c
index f5ed236467f5..189d4661c78b 100644
--- a/lib/lib80211/lib80211_regdomain.c
+++ b/lib/lib80211/lib80211_regdomain.c
@@ -22,9 +22,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$FreeBSD$";
-#endif /* not lint */
#include <sys/types.h>
#include <sys/errno.h>
diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l
index bd3c02dcacf4..ce0f18670e21 100644
--- a/lib/libc/net/nslexer.l
+++ b/lib/libc/net/nslexer.l
@@ -32,12 +32,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid =
- "$FreeBSD$";
-#endif /* LIBC_SCCS and not lint */
-
#include "namespace.h"
#include <ctype.h>
#define _NS_PRIVATE
diff --git a/lib/libc/powerpc/gen/syncicache.c b/lib/libc/powerpc/gen/syncicache.c
index 5192d1356153..6376cb0e576d 100644
--- a/lib/libc/powerpc/gen/syncicache.c
+++ b/lib/libc/powerpc/gen/syncicache.c
@@ -33,11 +33,6 @@
* $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#if defined(_KERNEL) || defined(_STANDALONE)
#include <sys/time.h>
diff --git a/lib/libc/powerpc64/gen/syncicache.c b/lib/libc/powerpc64/gen/syncicache.c
index d96529bc3833..7885a36bd1d1 100644
--- a/lib/libc/powerpc64/gen/syncicache.c
+++ b/lib/libc/powerpc64/gen/syncicache.c
@@ -33,11 +33,6 @@
* $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#if defined(_KERNEL) || defined(_STANDALONE)
#include <sys/time.h>
diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c
index 1fd0cec447fb..f9e2a320f20e 100644
--- a/lib/msun/src/e_sqrtf.c
+++ b/lib/msun/src/e_sqrtf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD$";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c
index ab13191b9004..ffb1702751fa 100644
--- a/lib/msun/src/s_modf.c
+++ b/lib/msun/src/s_modf.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD$";
-#endif
-
/*
* modf(double x, double *iptr)
* return fraction part of x, and return x's integral part in *iptr.
diff --git a/lib/msun/src/w_cabsf.c b/lib/msun/src/w_cabsf.c
index b5065c8a5683..aedbdef217ca 100644
--- a/lib/msun/src/w_cabsf.c
+++ b/lib/msun/src/w_cabsf.c
@@ -5,11 +5,6 @@
* Placed into the Public Domain, 1994.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <complex.h>
#include <math.h>
#include "math_private.h"
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index e9e49146ba7a..ee312591ccd4 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -26,11 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
/* System Headers */
#include <sys/fcntl.h>
diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c
index 86651aac3e67..e513183a391c 100644
--- a/libexec/atrun/gloadavg.c
+++ b/libexec/atrun/gloadavg.c
@@ -25,11 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#ifndef __FreeBSD__
#define _POSIX_SOURCE 1
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h
index f0ae6b45e868..a202cf0b3700 100644
--- a/libexec/atrun/gloadavg.h
+++ b/libexec/atrun/gloadavg.h
@@ -26,6 +26,3 @@
*/
double gloadavg(void);
-#if 0
-static char atrun_h_rcsid[] = "$FreeBSD$";
-#endif
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index c9d490d2cf6e..138881db9e4a 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)comsat.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index ff8d5046a577..dd51064a00a6 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)fingerd.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index 79b9601a2be1..e09cbf2c3e94 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)from: init.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 68682df6d5bd..2c262e0968ca 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)from: subr.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index d340142aad90..5375b80fbe3b 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -38,11 +38,6 @@
#include <sys/types.h>
#include "hash.h"
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
/*
* This hash function is stolen directly from the
* Berkeley DB package. It already exists inside libc, but
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 3a39b4b3e675..a5c8281ef34d 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -55,11 +55,6 @@
#include "hash.h"
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#define LINSIZ 1024
#define OPSYS "unix"
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index e876bd9f2ff0..59ebf44eab37 100644
--- a/libexec/mknetid/parse_group.c
+++ b/libexec/mknetid/parse_group.c
@@ -33,8 +33,6 @@
#if 0
static const char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index 0edcc06ccf7e..6fbe34111a67 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -46,8 +46,6 @@
#if 0
static const char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c
index af46f53c3c88..a48d3efdb9c1 100644
--- a/libexec/rbootd/conf.c
+++ b/libexec/rbootd/conf.c
@@ -46,8 +46,6 @@
#if 0
static const char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 9585e87185c6..262f81fb68d7 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -46,8 +46,6 @@
#if 0
static const char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index a31ec1de8abf..2603e697d8b8 100644
--- a/libexec/rbootd/rmpproto.c
+++ b/libexec/rbootd/rmpproto.c
@@ -46,8 +46,6 @@
#if 0
static const char sccsid[] = "@(#)rmpproto.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c
index f5c2d62d30d7..36a7116a05c4 100644
--- a/libexec/rbootd/utils.c
+++ b/libexec/rbootd/utils.c
@@ -46,8 +46,6 @@
#if 0
static const char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index 2dd1a3f91d74..db8e95e3040c 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index a1e954164ea9..3d6a7939fa1d 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
/*
* This is a specially hacked-up version of getnetgrent.c used to parse
* data from the stored hash table of netgroup info rather than from a
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 11fba515a7ba..34ec0d9491c4 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -38,11 +38,6 @@
* Columbia University, New York City
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index 1f1bb7cf4048..cc488657c077 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -32,8 +32,6 @@
static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";
static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif
/*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 6a6b09b9ae0c..7cc3bac71c5d 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <stdlib.h>
#include <rpc/rpc.h>
#include <signal.h>
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index bfb65dadb004..3bc4169a989f 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#ifdef DEBUG
#include <errno.h>
#endif
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index e1e77398c8ff..cf00dd8d181e 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <stdlib.h>
#include <rpc/rpc.h>
#include <sys/socket.h>
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index 209d74af59af..2a71a93bf4ef 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -27,11 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <rpc/rpc.h>
#include <rpcsvc/spray.h>
#include <signal.h>
diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c
index 4b5140551675..dafbc222322e 100644
--- a/libexec/rtld-elf/rtld_malloc.c
+++ b/libexec/rtld-elf/rtld_malloc.c
@@ -31,7 +31,6 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$FreeBSD$";
#endif /* LIBC_SCCS and not lint */
/*
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index 9cf326669998..b1b1acc09553 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)announce.c 8.3 (Berkeley) 4/28/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 4d10329dd7f8..47ccb89f20d6 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/* debug print routines */
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index 2bd22a1becb2..886fc038ab97 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)process.c 8.2 (Berkeley) 11/16/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index ed1560f86ff8..495d63b02b06 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index eb609207b156..76d0ec5a09ad 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)talkd.c 8.1 (Berkeley) 6/4/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index d1769faa3daf..a8b2d9c221da 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index cb6d55625e6d..d9121e4df05a 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 779db5fb4b43..a5b4eaa6f8ac 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 8eb163516c72..d3ca5b2a926e 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index c123f7fa9404..3a3574f6d44d 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 08e902667759..281cffcdf6f2 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 3e03a65f1a7c..5f44c80f9358 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)unctime.c 8.2 (Berkeley) 6/14/94";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <time.h>
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 739f281feb7f..7d2598c190e8 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -54,8 +54,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 9d447d209ffd..539cbd1631e1 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -48,11 +48,6 @@ Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\
All rights reserved.\n";
#endif /* not lint */
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
/* ********************************************************** INCLUDES ***** */
#include <sys/param.h>
#include <sys/disklabel.h>
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 3d1657ad66f3..f91609470ad7 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: boot.c,v 1.22 2020/01/11 16:29:07 christos Exp $");
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 654ceeb9c5ca..f672a2ac515c 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: check.c,v 1.14 2006/06/05 16:51:18 christos Exp $");
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#ifdef HAVE_LIBUTIL_H
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index 02fe07880e0e..c60eaab59b12 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -32,8 +32,6 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: dir.c,v 1.20 2006/06/05 16:51:18 christos Exp $");
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <assert.h>
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index e35e2f27d305..567bfcd428cb 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -30,8 +30,6 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: fat.c,v 1.18 2006/06/05 16:51:18 christos Exp $");
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/endian.h>
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index de54cd18eae7..0713189daa2d 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $");
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <stdlib.h>
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 2d8c75cce5fe..48526ad4044b 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -30,11 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <ctype.h>
#include <err.h>
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index c8a3a8a525e3..737dabba643f 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -30,11 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <ctype.h>
#include <err.h>
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index cd60093e3642..2a5eb0c5136d 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -32,11 +32,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/resource.h>
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index e0dfc997fcf6..456e67dbc5c2 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -41,11 +41,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <limits.h>
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
index 83b605e8c4cb..d9499d64ed13 100644
--- a/sbin/ifconfig/af_inet.c
+++ b/sbin/ifconfig/af_inet.c
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index a0138e9b3de6..bc4f77f6848d 100644
--- a/sbin/ifconfig/af_inet6.c
+++ b/sbin/ifconfig/af_inet6.c
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c
index 2a53daeb7d01..ab35d04a8709 100644
--- a/sbin/ifconfig/af_link.c
+++ b/sbin/ifconfig/af_link.c
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c
index 7eeb86585197..73044e95740a 100644
--- a/sbin/ifconfig/af_nd6.c
+++ b/sbin/ifconfig/af_nd6.c
@@ -25,11 +25,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
*** 1171 LINES SKIPPED ***