D41957.diff
No OneTemporary
Actions

Size

44 KB

Referenced Files

None

Subscribers

None

D41957.diff
View Options

	diff --git a/lib/lib80211/lib80211_regdomain.c b/lib/lib80211/lib80211_regdomain.c
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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.h b/libexec/atrun/gloadavg.h
	--- 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/atrun/gloadavg.c b/libexec/atrun/gloadavg.c
	--- 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/comsat/comsat.c b/libexec/comsat/comsat.c
	--- a/libexec/comsat/comsat.c
	+++ b/libexec/comsat/comsat.c
	@@ -39,8 +39,6 @@
	#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
	--- a/libexec/fingerd/fingerd.c
	+++ b/libexec/fingerd/fingerd.c
	@@ -39,8 +39,6 @@
	#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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/libexec/talkd/talkd.c
	+++ b/libexec/talkd/talkd.c
	@@ -39,8 +39,6 @@
	#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
	--- 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
	--- 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
	--- a/sbin/dump/main.c
	+++ b/sbin/dump/main.c
	@@ -39,8 +39,6 @@
	#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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/sbin/dumpfs/dumpfs.c
	+++ b/sbin/dumpfs/dumpfs.c
	@@ -54,8 +54,6 @@
	#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
	--- a/sbin/ffsinfo/ffsinfo.c
	+++ b/sbin/ffsinfo/ffsinfo.c
	@@ -48,11 +48,6 @@
	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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/sbin/ifconfig/ifconfig.c
	+++ b/sbin/ifconfig/ifconfig.c
	@@ -36,8 +36,6 @@
	#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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/sbin/init/init.c
	+++ b/sbin/init/init.c
	@@ -42,8 +42,6 @@
	#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
	--- a/sbin/mknod/mknod.c
	+++ b/sbin/mknod/mknod.c
	@@ -42,8 +42,6 @@
	#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
	--- a/sbin/mount/mount_fs.c
	+++ b/sbin/mount/mount_fs.c
	@@ -42,8 +42,6 @@
	#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
	--- a/sbin/mount_cd9660/mount_cd9660.c
	+++ b/sbin/mount_cd9660/mount_cd9660.c
	@@ -46,8 +46,6 @@
	/*
	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
	--- 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
	--- a/sbin/mount_nullfs/mount_nullfs.c
	+++ b/sbin/mount_nullfs/mount_nullfs.c
	@@ -42,8 +42,6 @@
	#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
	--- a/sbin/mount_unionfs/mount_unionfs.c
	+++ b/sbin/mount_unionfs/mount_unionfs.c
	@@ -44,9 +44,6 @@
	#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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/sbin/umount/umount.c
	+++ b/sbin/umount/umount.c
	@@ -39,8 +39,6 @@
	#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
	--- 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
	--- a/sys/netpfil/ipfilter/netinet/fil.c
	+++ b/sys/netpfil/ipfilter/netinet/fil.c
	@@ -103,7 +103,6 @@

	#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
	--- 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
	--- 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
	--- a/sys/netpfil/ipfilter/netinet/ip_nat.c
	+++ b/sys/netpfil/ipfilter/netinet/ip_nat.c
	@@ -107,7 +107,6 @@

	#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
	--- a/usr.bin/locate/locate/locate.c
	+++ b/usr.bin/locate/locate/locate.c
	@@ -44,8 +44,6 @@
	#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
	--- 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
	--- a/usr.bin/morse/morse.c
	+++ b/usr.bin/morse/morse.c
	@@ -39,8 +39,6 @@
	#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
	--- a/usr.bin/nfsstat/nfsstat.c
	+++ b/usr.bin/nfsstat/nfsstat.c
	@@ -70,8 +70,6 @@
	#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
	--- a/usr.bin/number/number.c
	+++ b/usr.bin/number/number.c
	@@ -37,8 +37,6 @@
	#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
	--- 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
	--- 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
	--- a/usr.bin/primes/primes.c
	+++ b/usr.bin/primes/primes.c
	@@ -40,8 +40,6 @@
	#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
	--- a/usr.bin/printf/printf.c
	+++ b/usr.bin/printf/printf.c
	@@ -48,8 +48,6 @@
	#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
	--- a/usr.bin/showmount/showmount.c
	+++ b/usr.bin/showmount/showmount.c
	@@ -42,8 +42,6 @@
	#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
	--- a/usr.bin/tee/tee.c
	+++ b/usr.bin/tee/tee.c
	@@ -39,8 +39,6 @@
	#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
	--- a/usr.bin/time/time.c
	+++ b/usr.bin/time/time.c
	@@ -39,8 +39,6 @@
	#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
	--- 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
	--- a/usr.bin/ul/ul.c
	+++ b/usr.bin/ul/ul.c
	@@ -39,8 +39,6 @@
	#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
	--- a/usr.bin/uniq/uniq.c
	+++ b/usr.bin/uniq/uniq.c
	@@ -42,8 +42,6 @@
	#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
	--- 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
	--- a/usr.bin/yes/yes.c
	+++ b/usr.bin/yes/yes.c
	@@ -38,8 +38,6 @@
	#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
	--- 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
	--- 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
	--- 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
	--- a/usr.sbin/config/main.cc
	+++ b/usr.sbin/config/main.cc
	@@ -39,8 +39,6 @@
	#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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/usr.sbin/nfsd/nfsd.c
	+++ b/usr.sbin/nfsd/nfsd.c
	@@ -42,8 +42,6 @@
	#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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- a/usr.sbin/traceroute6/traceroute6.c
	+++ b/usr.sbin/traceroute6/traceroute6.c
	@@ -73,8 +73,6 @@
	#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
	--- 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
	--- 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>

File Metadata

Mime Type: text/plain
Expires: Wed, Apr 30, 1:58 PM (7 h, 2 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 17859161
Default Alt Text: D41957.diff (44 KB)

D41957.diffNo OneTemporaryActions

D41957.diffView Options

File Metadata

Event Timeline

D41957.diff
No OneTemporary
Actions

D41957.diff
View Options