aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/lib80211/lib80211_regdomain.c3
-rw-r--r--lib/libc/net/nslexer.l6
-rw-r--r--lib/libc/powerpc/gen/syncicache.c5
-rw-r--r--lib/libc/powerpc64/gen/syncicache.c5
-rw-r--r--lib/msun/src/e_sqrtf.c4
-rw-r--r--lib/msun/src/s_modf.c4
-rw-r--r--lib/msun/src/w_cabsf.c5
-rw-r--r--libexec/atrun/atrun.c5
-rw-r--r--libexec/atrun/gloadavg.c5
-rw-r--r--libexec/atrun/gloadavg.h3
-rw-r--r--libexec/comsat/comsat.c2
-rw-r--r--libexec/fingerd/fingerd.c2
-rw-r--r--libexec/getty/init.c2
-rw-r--r--libexec/getty/subr.c2
-rw-r--r--libexec/mknetid/hash.c5
-rw-r--r--libexec/mknetid/mknetid.c5
-rw-r--r--libexec/mknetid/parse_group.c2
-rw-r--r--libexec/rbootd/bpf.c2
-rw-r--r--libexec/rbootd/conf.c2
-rw-r--r--libexec/rbootd/parseconf.c2
-rw-r--r--libexec/rbootd/rmpproto.c2
-rw-r--r--libexec/rbootd/utils.c2
-rw-r--r--libexec/revnetgroup/hash.c5
-rw-r--r--libexec/revnetgroup/parse_netgroup.c5
-rw-r--r--libexec/revnetgroup/revnetgroup.c5
-rw-r--r--libexec/rpc.rstatd/rstat_proc.c2
-rw-r--r--libexec/rpc.rstatd/rstatd.c5
-rw-r--r--libexec/rpc.rusersd/rusers_proc.c5
-rw-r--r--libexec/rpc.rusersd/rusersd.c5
-rw-r--r--libexec/rpc.sprayd/sprayd.c5
-rw-r--r--libexec/rtld-elf/rtld_malloc.c1
-rw-r--r--libexec/talkd/announce.c2
-rw-r--r--libexec/talkd/print.c2
-rw-r--r--libexec/talkd/process.c2
-rw-r--r--libexec/talkd/table.c2
-rw-r--r--libexec/talkd/talkd.c2
-rw-r--r--sbin/dump/dumprmt.c2
-rw-r--r--sbin/dump/itime.c2
-rw-r--r--sbin/dump/main.c2
-rw-r--r--sbin/dump/optr.c2
-rw-r--r--sbin/dump/tape.c2
-rw-r--r--sbin/dump/traverse.c2
-rw-r--r--sbin/dump/unctime.c2
-rw-r--r--sbin/dumpfs/dumpfs.c2
-rw-r--r--sbin/ffsinfo/ffsinfo.c5
-rw-r--r--sbin/fsck_msdosfs/boot.c2
-rw-r--r--sbin/fsck_msdosfs/check.c2
-rw-r--r--sbin/fsck_msdosfs/dir.c2
-rw-r--r--sbin/fsck_msdosfs/fat.c2
-rw-r--r--sbin/fsck_msdosfs/main.c2
-rw-r--r--sbin/fsdb/fsdb.c5
-rw-r--r--sbin/fsdb/fsdbutil.c5
-rw-r--r--sbin/fsirand/fsirand.c5
-rw-r--r--sbin/growfs/debug.c5
-rw-r--r--sbin/ifconfig/af_inet.c5
-rw-r--r--sbin/ifconfig/af_inet6.c5
-rw-r--r--sbin/ifconfig/af_link.c5
-rw-r--r--sbin/ifconfig/af_nd6.c5
-rw-r--r--sbin/ifconfig/ifbridge.c5
-rw-r--r--sbin/ifconfig/ifclone.c5
-rw-r--r--sbin/ifconfig/ifconfig.c2
-rw-r--r--sbin/ifconfig/ifgif.c5
-rw-r--r--sbin/ifconfig/ifgroup.c5
-rw-r--r--sbin/ifconfig/iflagg.c5
-rw-r--r--sbin/ifconfig/ifvlan.c5
-rw-r--r--sbin/ifconfig/sfp.c5
-rw-r--r--sbin/init/init.c2
-rw-r--r--sbin/mknod/mknod.c2
-rw-r--r--sbin/mount/mount_fs.c2
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c2
-rw-r--r--sbin/mount_msdosfs/mount_msdosfs.c5
-rw-r--r--sbin/mount_nullfs/mount_nullfs.c2
-rw-r--r--sbin/mount_unionfs/mount_unionfs.c3
-rw-r--r--sbin/newfs_msdos/mkfs_msdos.c5
-rw-r--r--sbin/newfs_msdos/newfs_msdos.c5
-rw-r--r--sbin/nos-tun/nos-tun.c5
-rw-r--r--sbin/restore/dirs.c2
-rw-r--r--sbin/restore/symtab.c2
-rw-r--r--sbin/restore/utilities.c2
-rw-r--r--sbin/umount/umount.c2
-rw-r--r--stand/libsa/powerpc/syncicache.c5
-rw-r--r--sys/netpfil/ipfilter/netinet/fil.c1
-rw-r--r--sys/netpfil/ipfilter/netinet/ip_auth.c1
-rw-r--r--sys/netpfil/ipfilter/netinet/ip_frag.c1
-rw-r--r--sys/netpfil/ipfilter/netinet/ip_nat.c1
-rw-r--r--usr.bin/locate/locate/locate.c2
-rw-r--r--usr.bin/mktemp/mktemp.c5
-rw-r--r--usr.bin/morse/morse.c2
-rw-r--r--usr.bin/nfsstat/nfsstat.c2
-rw-r--r--usr.bin/number/number.c2
-rw-r--r--usr.bin/primes/pattern.c2
-rw-r--r--usr.bin/primes/pr_tbl.c2
-rw-r--r--usr.bin/primes/primes.c2
-rw-r--r--usr.bin/printf/printf.c2
-rw-r--r--usr.bin/showmount/showmount.c2
-rw-r--r--usr.bin/tee/tee.c2
-rw-r--r--usr.bin/time/time.c2
-rw-r--r--usr.bin/truncate/truncate.c3
-rw-r--r--usr.bin/ul/ul.c2
-rw-r--r--usr.bin/uniq/uniq.c2
-rw-r--r--usr.bin/units/units.c5
-rw-r--r--usr.bin/yes/yes.c2
-rw-r--r--usr.sbin/apmd/apmd.c5
-rw-r--r--usr.sbin/btxld/btxld.c5
-rw-r--r--usr.sbin/ckdist/ckdist.c5
-rw-r--r--usr.sbin/config/main.cc2
-rw-r--r--usr.sbin/config/mkheaders.c2
-rw-r--r--usr.sbin/config/mkmakefile.cc2
-rw-r--r--usr.sbin/config/mkoptions.cc2
-rw-r--r--usr.sbin/flowctl/flowctl.c5
-rw-r--r--usr.sbin/keyserv/crypt_server.c5
-rw-r--r--usr.sbin/keyserv/keyserv.c2
-rw-r--r--usr.sbin/keyserv/setkey.c2
-rw-r--r--usr.sbin/mptable/mptable.c5
-rw-r--r--usr.sbin/nfsd/nfsd.c2
-rw-r--r--usr.sbin/pciconf/cap.c5
-rw-r--r--usr.sbin/pciconf/err.c5
-rw-r--r--usr.sbin/pciconf/pciconf.c5
-rw-r--r--usr.sbin/pw/bitmap.c5
-rw-r--r--usr.sbin/pw/cpdir.c5
-rw-r--r--usr.sbin/pw/grupd.c5
-rw-r--r--usr.sbin/pw/psdate.c5
-rw-r--r--usr.sbin/pw/pw.c5
-rw-r--r--usr.sbin/pw/pw_conf.c5
-rw-r--r--usr.sbin/pw/pw_group.c5
-rw-r--r--usr.sbin/pw/pw_log.c5
-rw-r--r--usr.sbin/pw/pw_nis.c5
-rw-r--r--usr.sbin/pw/pw_user.c5
-rw-r--r--usr.sbin/pw/pw_vpw.c5
-rw-r--r--usr.sbin/pw/pwupd.c5
-rw-r--r--usr.sbin/pw/rm_r.c5
-rw-r--r--usr.sbin/rpc.lockd/test.c1
-rw-r--r--usr.sbin/rpc.statd/test.c5
-rw-r--r--usr.sbin/rpc.umntall/rpc.umntall.c5
-rw-r--r--usr.sbin/rpc.ypupdated/update.c2
-rw-r--r--usr.sbin/spray/spray.c5
-rw-r--r--usr.sbin/traceroute6/traceroute6.c2
-rw-r--r--usr.sbin/vidcontrol/decode.c5
-rw-r--r--usr.sbin/vidcontrol/vidcontrol.c5
139 files changed, 0 insertions, 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>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
index 3a97a5af3931..9b499b404946 100644
--- a/sbin/ifconfig/ifbridge.c
+++ b/sbin/ifconfig/ifbridge.c
@@ -35,11 +35,6 @@
* POSSIBILITY OF 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/ifclone.c b/sbin/ifconfig/ifclone.c
index 8b378cbe341f..f44d052c97ad 100644
--- a/sbin/ifconfig/ifclone.c
+++ b/sbin/ifconfig/ifclone.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/queue.h>
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 1a7e5d07e601..4e2f8e782de9 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -36,8 +36,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/ifconfig/ifgif.c b/sbin/ifconfig/ifgif.c
index 3a41ef63d1d3..6a4bb8b5a240 100644
--- a/sbin/ifconfig/ifgif.c
+++ b/sbin/ifconfig/ifgif.c
@@ -25,11 +25,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c
index 702e4732db7c..49cce678bb5e 100644
--- a/sbin/ifconfig/ifgroup.c
+++ b/sbin/ifconfig/ifgroup.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>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/iflagg.c b/sbin/ifconfig/iflagg.c
index 9d148c314119..4de437d25bd9 100644
--- a/sbin/ifconfig/iflagg.c
+++ b/sbin/ifconfig/iflagg.c
@@ -1,11 +1,6 @@
/*-
*/
-#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/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 90854885b561..a79ea35bc14b 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -59,11 +59,6 @@
#include "ifconfig.h"
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif
-
#define NOTAG ((u_short) -1)
static const char proto_8021Q[] = "802.1q";
diff --git a/sbin/ifconfig/sfp.c b/sbin/ifconfig/sfp.c
index a357a2bbefdd..0dc1def751b1 100644
--- a/sbin/ifconfig/sfp.c
+++ b/sbin/ifconfig/sfp.c
@@ -23,11 +23,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
diff --git a/sbin/init/init.c b/sbin/init/init.c
index dd8800d21910..d5200e4cfe35 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -42,8 +42,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index be7c97cf06fb..091c05cbfac2 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -42,8 +42,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)mknod.c 8.1 (Berkeley) 6/5/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c
index 5674e94594bf..7aac2b0ce104 100644
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -42,8 +42,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)mount_fs.c 8.6 (Berkeley) 4/26/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index f322ac73a439..f867e94da417 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -46,8 +46,6 @@ static const char copyright[] =
/*
static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95";
*/
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/cdio.h>
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index 36be6a161ecf..9128914bc2b0 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -32,11 +32,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/stat.h>
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index 55d7ac982f70..c6bf09a1ca1c 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -42,8 +42,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)mount_null.c 8.6 (Berkeley) 4/26/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 9aafaf13d81f..01c32f267923 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -44,9 +44,6 @@ static const char copyright[] =
#ifndef lint
#if 0
static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94";
-#else
-static const char rcsid[] =
- "$FreeBSD$";
#endif
#endif /* not lint */
diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c
index 13a804c82625..065e3c5f4192 100644
--- a/sbin/newfs_msdos/mkfs_msdos.c
+++ b/sbin/newfs_msdos/mkfs_msdos.c
@@ -25,11 +25,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#ifdef MAKEFS
/* In the makefs case we only want struct disklabel */
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 1ba399fe447e..312a862d9113 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -27,11 +27,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <err.h>
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index 509f928a2bb8..f3af62db265b 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -57,11 +57,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/signal.h>
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 4a25b728e8a0..db9e05a0bc50 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -38,8 +38,6 @@
#if 0
static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 49ed39dd2022..0172a2c593d0 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)symtab.c 8.3 (Berkeley) 4/28/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index a53d42f9e600..d95330f6de4a 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)utilities.c 8.5 (Berkeley) 4/28/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index 9119c5be0da1..aca7c201bc9b 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)umount.c 8.8 (Berkeley) 5/8/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/stand/libsa/powerpc/syncicache.c b/stand/libsa/powerpc/syncicache.c
index 434dcec63416..0fcb1914a0da 100644
--- a/stand/libsa/powerpc/syncicache.c
+++ b/stand/libsa/powerpc/syncicache.c
@@ -31,11 +31,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/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c
index b04ec3496a65..76fde8622498 100644
--- a/sys/netpfil/ipfilter/netinet/fil.c
+++ b/sys/netpfil/ipfilter/netinet/fil.c
@@ -103,7 +103,6 @@ extern struct callout ipf_slowtimer_ch;
#if !defined(lint)
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
/* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.125 2007/10/10 09:27:20 darrenr Exp $"; */
#endif
diff --git a/sys/netpfil/ipfilter/netinet/ip_auth.c b/sys/netpfil/ipfilter/netinet/ip_auth.c
index 5ce89c93c199..1f2de1d34eb1 100644
--- a/sys/netpfil/ipfilter/netinet/ip_auth.c
+++ b/sys/netpfil/ipfilter/netinet/ip_auth.c
@@ -109,7 +109,6 @@
/* END OF INCLUDES */
#if !defined(lint)
-static const char rcsid[] = "@(#)$FreeBSD$";
/* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */
#endif
diff --git a/sys/netpfil/ipfilter/netinet/ip_frag.c b/sys/netpfil/ipfilter/netinet/ip_frag.c
index 111b8cc1dc29..ca71714e3a56 100644
--- a/sys/netpfil/ipfilter/netinet/ip_frag.c
+++ b/sys/netpfil/ipfilter/netinet/ip_frag.c
@@ -74,7 +74,6 @@
#if !defined(lint)
static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
/* static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.77.2.12 2007/09/20 12:51:51 darrenr Exp $"; */
#endif
diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c
index 6163c9fa8191..136bc31ba0f4 100644
--- a/sys/netpfil/ipfilter/netinet/ip_nat.c
+++ b/sys/netpfil/ipfilter/netinet/ip_nat.c
@@ -107,7 +107,6 @@ extern struct ifnet vpnif;
#if !defined(lint)
static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
/* static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.195.2.102 2007/10/16 10:08:10 darrenr Exp $"; */
#endif
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 31c74d721c74..d1597c277d40 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -44,8 +44,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index e16c2a001a01..3be86bf21a02 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -45,11 +45,6 @@
#include <string.h>
#include <unistd.h>
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
static void usage(void) __dead2;
static const struct option long_opts[] = {
diff --git a/usr.bin/morse/morse.c b/usr.bin/morse/morse.c
index 7e018f3b9aee..1e72b0b03931 100644
--- a/usr.bin/morse/morse.c
+++ b/usr.bin/morse/morse.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 9ea242cef890..11f403a9c14c 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -70,8 +70,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)nfsstat.c 8.2 (Berkeley) 3/31/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/number/number.c b/usr.bin/number/number.c
index e8cf181cb57a..da5d7d2bedab 100644
--- a/usr.bin/number/number.c
+++ b/usr.bin/number/number.c
@@ -37,8 +37,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)number.c 8.3 (Berkeley) 5/4/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/primes/pattern.c b/usr.bin/primes/pattern.c
index 2b30678cf3b5..25739b96b575 100644
--- a/usr.bin/primes/pattern.c
+++ b/usr.bin/primes/pattern.c
@@ -34,8 +34,6 @@
#if 0
static char sccsid[] = "@(#)pattern.c 8.1 (Berkeley) 5/31/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.bin/primes/pr_tbl.c b/usr.bin/primes/pr_tbl.c
index 5bb709330b83..7bf25e994e1f 100644
--- a/usr.bin/primes/pr_tbl.c
+++ b/usr.bin/primes/pr_tbl.c
@@ -34,8 +34,6 @@
#if 0
static char sccsid[] = "@(#)pr_tbl.c 8.1 (Berkeley) 5/31/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.bin/primes/primes.c b/usr.bin/primes/primes.c
index aca63f99cc5e..949ded680d5b 100644
--- a/usr.bin/primes/primes.c
+++ b/usr.bin/primes/primes.c
@@ -40,8 +40,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 94667f381a60..9ce413b750b7 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -48,8 +48,6 @@ static char const copyright[] =
#if 0
static char const sccsid[] = "@(#)printf.c 8.1 (Berkeley) 7/20/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index d2b9f46792ba..f87965e107fc 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -42,8 +42,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)showmount.c 8.3 (Berkeley) 3/29/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 5646930a1c98..c4fe945d6d12 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)tee.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/capsicum.h>
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 64063212170d..8e45f1283317 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c
index ca705f055add..d8484257294a 100644
--- a/usr.bin/truncate/truncate.c
+++ b/usr.bin/truncate/truncate.c
@@ -32,9 +32,6 @@
*
*/
-static const char rcsid[] =
- "$FreeBSD$";
-
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 07a796ffd55b..5b52db208b68 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 36fb037df283..1513ae185bcf 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -42,8 +42,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/capsicum.h>
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 88363e2e6c34..78b7e4020ed3 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -17,11 +17,6 @@
* improvements you might make to this program.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index 03111ed53fc1..60820368cea1 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -38,8 +38,6 @@ static const char copyright[] =
#ifndef lint
#if 0
static char sccsid[] = "@(#)yes.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$FreeBSD$";
#endif
#endif /* not lint */
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 54003a33ad3e..0a3fcf6315e0 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/types.h>
#include <assert.h>
#include <bitstring.h>
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index e7211ad48fa4..86d380926e90 100644
--- a/usr.sbin/btxld/btxld.c
+++ b/usr.sbin/btxld/btxld.c
@@ -26,11 +26,6 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/stat.h>
diff --git a/usr.sbin/ckdist/ckdist.c b/usr.sbin/ckdist/ckdist.c
index caee507f246b..ccd3a7ddf298 100644
--- a/usr.sbin/ckdist/ckdist.c
+++ b/usr.sbin/ckdist/ckdist.c
@@ -27,11 +27,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.sbin/config/main.cc b/usr.sbin/config/main.cc
index f6c99e32c594..59af07b76c8d 100644
--- a/usr.sbin/config/main.cc
+++ b/usr.sbin/config/main.cc
@@ -39,8 +39,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 5dfde12c1db8..f1fc967bf1be 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)mkheaders.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.sbin/config/mkmakefile.cc b/usr.sbin/config/mkmakefile.cc
index 232933711ce5..49990c4a250c 100644
--- a/usr.sbin/config/mkmakefile.cc
+++ b/usr.sbin/config/mkmakefile.cc
@@ -33,8 +33,6 @@
#if 0
static char sccsid[] = "@(#)mkmakefile.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.sbin/config/mkoptions.cc b/usr.sbin/config/mkoptions.cc
index 1ffb9722af8b..53c8fa796a26 100644
--- a/usr.sbin/config/mkoptions.cc
+++ b/usr.sbin/config/mkoptions.cc
@@ -34,8 +34,6 @@
#if 0
static char sccsid[] = "@(#)mkheaders.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.sbin/flowctl/flowctl.c b/usr.sbin/flowctl/flowctl.c
index 9385ea566c70..e7684a68a35b 100644
--- a/usr.sbin/flowctl/flowctl.c
+++ b/usr.sbin/flowctl/flowctl.c
@@ -29,11 +29,6 @@
* $SourceForge: flowctl.c,v 1.15 2004/08/31 20:24:58 glebius Exp $
*/
-#ifndef lint
-static const char rcs_id[] =
- "@(#) $FreeBSD$";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c
index 25f48e978781..04290326cf3b 100644
--- a/usr.sbin/keyserv/crypt_server.c
+++ b/usr.sbin/keyserv/crypt_server.c
@@ -42,11 +42,6 @@
#include <rpc/des.h>
#include "crypt.h"
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
/*
* The U.S. government stupidly believes that a) it can keep strong
* crypto code a secret and b) that doing so somehow protects national
diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 7935a72941ae..bc219e886020 100644
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -31,8 +31,6 @@
#if 0
static char sccsid[] = "@(#)keyserv.c 1.15 94/04/25 SMI";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c
index d829e68937ef..d1496190b559 100644
--- a/usr.sbin/keyserv/setkey.c
+++ b/usr.sbin/keyserv/setkey.c
@@ -31,8 +31,6 @@
#if 0
static char sccsid[] = "@(#)setkey.c 1.11 94/04/25 SMI";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index 79bee8e1edd8..0d1e169ec96f 100644
--- a/usr.sbin/mptable/mptable.c
+++ b/usr.sbin/mptable/mptable.c
@@ -29,11 +29,6 @@
* mptable.c
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
/*
* this will cause the raw mp table to be dumped to /tmp/mpdump
*
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 3a7f58c7b4e5..be26e0be77e8 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -42,8 +42,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)nfsd.c 8.9 (Berkeley) 3/29/95";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.sbin/pciconf/cap.c b/usr.sbin/pciconf/cap.c
index 9cae4bc49e03..8595bff3d3d7 100644
--- a/usr.sbin/pciconf/cap.c
+++ b/usr.sbin/pciconf/cap.c
@@ -30,11 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.sbin/pciconf/err.c b/usr.sbin/pciconf/err.c
index fc5cdbef7f70..dca0ca1cea87 100644
--- a/usr.sbin/pciconf/err.c
+++ b/usr.sbin/pciconf/err.c
@@ -27,11 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/pciio.h>
diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index 946adc080720..83ea50efb183 100644
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -27,11 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/mman.h>
diff --git a/usr.sbin/pw/bitmap.c b/usr.sbin/pw/bitmap.c
index b7767f025529..f176fe571a36 100644
--- a/usr.sbin/pw/bitmap.c
+++ b/usr.sbin/pw/bitmap.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c
index 8ffca63bdb70..504933ab88af 100644
--- a/usr.sbin/pw/cpdir.c
+++ b/usr.sbin/pw/cpdir.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <dirent.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/pw/grupd.c b/usr.sbin/pw/grupd.c
index f29ea882ca83..392e32b3ee7a 100644
--- a/usr.sbin/pw/grupd.c
+++ b/usr.sbin/pw/grupd.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <err.h>
#include <grp.h>
#include <libutil.h>
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index 5e91ca59784f..7d37e6b4aa1b 100644
--- a/usr.sbin/pw/psdate.c
+++ b/usr.sbin/pw/psdate.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <stdlib.h>
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index 5b30cdf221af..063553dd084f 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/pw/pw.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <err.h>
#include <fcntl.h>
#include <locale.h>
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index 0ec88f60eda1..e9042b15b321 100644
--- a/usr.sbin/pw/pw_conf.c
+++ b/usr.sbin/pw/pw_conf.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <err.h>
#include <fcntl.h>
#include <string.h>
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index 48f999d3e1d3..32dec769fb1a 100644
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <grp.h>
diff --git a/usr.sbin/pw/pw_log.c b/usr.sbin/pw/pw_log.c
index 1dbffc8b5d9d..43dd4207ba29 100644
--- a/usr.sbin/pw/pw_log.c
+++ b/usr.sbin/pw/pw_log.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <fcntl.h>
diff --git a/usr.sbin/pw/pw_nis.c b/usr.sbin/pw/pw_nis.c
index 0126990d61cb..23e82239379f 100644
--- a/usr.sbin/pw/pw_nis.c
+++ b/usr.sbin/pw/pw_nis.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 3e5a9841c5f3..6875d931a1d2 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -27,11 +27,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index 3ee1e794c4a5..4814ec2076d6 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -27,11 +27,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <pwd.h>
#include <grp.h>
#include <libutil.h>
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index 068b830726da..89c1553c8c92 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/wait.h>
#include <err.h>
diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c
index 6032a4769cd9..14218d68215b 100644
--- a/usr.sbin/pw/rm_r.c
+++ b/usr.sbin/pw/rm_r.c
@@ -26,11 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/stat.h>
#include <dirent.h>
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index a751e5c6f4e4..87449e3219e5 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -9,7 +9,6 @@ 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 $");
-static const char rcsid[] = "$FreeBSD$";
#endif
#endif /* not lint */
diff --git a/usr.sbin/rpc.statd/test.c b/usr.sbin/rpc.statd/test.c
index c3b342441781..2f18a159ba2d 100644
--- a/usr.sbin/rpc.statd/test.c
+++ b/usr.sbin/rpc.statd/test.c
@@ -1,8 +1,3 @@
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.c b/usr.sbin/rpc.umntall/rpc.umntall.c
index 620c5cb26f15..b5f0413c0857 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.c
+++ b/usr.sbin/rpc.umntall/rpc.umntall.c
@@ -27,11 +27,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/mount.h>
diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c
index f3d54b833d2f..635b097356e9 100644
--- a/usr.sbin/rpc.ypupdated/update.c
+++ b/usr.sbin/rpc.ypupdated/update.c
@@ -32,8 +32,6 @@
#if 0
static char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c
index 18caf3ff3bd9..436b28d32fba 100644
--- a/usr.sbin/spray/spray.c
+++ b/usr.sbin/spray/spray.c
@@ -30,11 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index d887acf5ae53..cf1c12c5962c 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -73,8 +73,6 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
/*
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c
index 160a6ca92e98..9db7c537a19f 100644
--- a/usr.sbin/vidcontrol/decode.c
+++ b/usr.sbin/vidcontrol/decode.c
@@ -28,11 +28,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <stdio.h>
#include <string.h>
#include "decode.h"
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 3e0ab102ae8c..e4cf1e8efc53 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -33,11 +33,6 @@
* $DragonFly: src/usr.sbin/vidcontrol/vidcontrol.c,v 1.10 2005/03/02 06:08:29 joerg Exp $
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <limits.h>