diff options
| author | obrien <obrien@FreeBSD.org> | 2003-05-03 18:41:59 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2003-05-03 18:41:59 +0000 |
| commit | 19105c8312c841631a5eff3408f8a43f4958e9ba (patch) | |
| tree | 49aa00dccbd9d3c7a4e310c1b0f3deb09f6b9f54 /sbin | |
| parent | 7113858cc752a0d0c37bba9a3ead02f89a580a71 (diff) | |
| download | FreeBSD-src-19105c8312c841631a5eff3408f8a43f4958e9ba.zip FreeBSD-src-19105c8312c841631a5eff3408f8a43f4958e9ba.tar.gz | |
Use __FBSDID() to quiet GCC 3.3 warnings.
Diffstat (limited to 'sbin')
42 files changed, 130 insertions, 160 deletions
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c index c6e72b6..40669c2 100644 --- a/sbin/adjkerntz/adjkerntz.c +++ b/sbin/adjkerntz/adjkerntz.c @@ -24,16 +24,15 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#)Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.\n\ All rights reserved.\n"; #endif /* not lint */ - -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Andrey A. Chernov <ache@astral.msk.su> Dec 20 1993 diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c index bce66c9..3dd2598 100644 --- a/sbin/badsect/badsect.c +++ b/sbin/badsect/badsect.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1981, 1983, 1993\n\ @@ -38,12 +39,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * badsect diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index 6d69353..19f5f1a 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -32,10 +32,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/linker.h> diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c index 0aa9c33..95f63ff 100644 --- a/sbin/clri/clri.c +++ b/sbin/clri/clri.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1990, 1993\n\ @@ -41,11 +42,9 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)clri.c 8.2 (Berkeley) 9/23/93"; -#endif #endif /* not lint */ - +#endif #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c index c65587f..302d5e6 100644 --- a/sbin/comcontrol/comcontrol.c +++ b/sbin/comcontrol/comcontrol.c @@ -26,10 +26,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> diff --git a/sbin/cxconfig/cxconfig.c b/sbin/cxconfig/cxconfig.c index 1a5ca48..05fd0d5 100644 --- a/sbin/cxconfig/cxconfig.c +++ b/sbin/cxconfig/cxconfig.c @@ -22,10 +22,8 @@ * -- set channel options */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index a6477fa..3d393ac 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -40,6 +40,7 @@ * from: $NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk $ */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1987, 1993\n\ @@ -47,12 +48,10 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94"; /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ -#endif #endif /* not lint */ - +#endif #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index 7525994..d2fb38d 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1993\n\ @@ -38,12 +39,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "From: @(#)swapon.c 8.1 (Berkeley) 6/5/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <stdio.h> diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 35fb205..44290f1 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -24,10 +24,8 @@ * the rights to redistribute these changes. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/disk.h> #include <sys/disklabel.h> diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 4b0d3bf..47e2bb4 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> @@ -211,9 +211,10 @@ dpok: static int dircheck(struct inodesc *idesc, struct direct *dp) { - int size; + size_t size; char *cp; - u_char namlen, type; + u_char type; + u_int namlen; int spaceleft; spaceleft = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ); diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c index d78f11e..2cdf71e 100644 --- a/sbin/fsck_ffs/ea.c +++ b/sbin/fsck_ffs/ea.c @@ -33,10 +33,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index c684b94..3985088 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index d05e330..b7152be 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stdint.h> diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 0e45917..2aab1fc 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1986, 1993\n\ @@ -38,11 +39,9 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95"; -#endif #endif /* not lint */ - +#endif #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 5a18abd..272b5f1 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index b30a2b1..d302952 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)pass1b.c 8.4 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index 388dc8e..470f986 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -36,7 +36,6 @@ static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95"; #endif /* not lint */ #endif - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c index f9bbfa7..0ae3267 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)pass3.c 8.2 (Berkeley) 4/27/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c index da29804..847dd97 100644 --- a/sbin/fsck_ffs/pass4.c +++ b/sbin/fsck_ffs/pass4.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)pass4.c 8.4 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index de0bd75..6dbde11 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -36,7 +36,6 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95"; #endif /* not lint */ #endif - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 6cbdf26..5fa884f 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c index 7210837..441fd93 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/types.h> diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c index 21f4d1c..0f7c721 100644 --- a/sbin/kldconfig/kldconfig.c +++ b/sbin/kldconfig/kldconfig.c @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/types.h> diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c index 1dd6591..9e841bc 100644 --- a/sbin/kldload/kldload.c +++ b/sbin/kldload/kldload.c @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <stdio.h> diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c index be699d5..d72e972 100644 --- a/sbin/kldstat/kldstat.c +++ b/sbin/kldstat/kldstat.c @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <stdint.h> diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c index 9893f3a..be86960 100644 --- a/sbin/kldunload/kldunload.c +++ b/sbin/kldunload/kldunload.c @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <stdio.h> diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 5c3bbb7..5a33664 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -17,10 +17,8 @@ * documentation and/or software. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/time.h> diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index ee1c736..0a6b985 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -30,10 +30,8 @@ * the deprecated mount_mfs(8). */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/mdioctl.h> diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index ffc18bf..04d2ff2 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -31,14 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static char sccsid[] = "@(#)getmntopts.c 8.3 (Berkeley) 3/29/95"; -#else -static const char rcsid[] = - "$FreeBSD$"; -#endif #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c index d820188..0362691 100644 --- a/sbin/mount/vfslist.c +++ b/sbin/mount/vfslist.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)vfslist.c 8.1 (Berkeley) 5/8/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <stdlib.h> diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index fd2e5f9..448d8c2 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ @@ -41,12 +42,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/mount.h> diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 895d5a9..faadedb 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -40,13 +40,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <limits.h> diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 33493c8..584ff0c 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -40,6 +40,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1983, 1989, 1993, 1994\n\ @@ -47,12 +48,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * newfs: friendly front end to mkfs diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c index 4d328d8..72432b4 100644 --- a/sbin/nfsiod/nfsiod.c +++ b/sbin/nfsiod/nfsiod.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -41,12 +42,11 @@ static const char copyright[] = #endif #ifndef lint -#if 0 static char sccsid[] = "@(#)nfsiod.c 8.4 (Berkeley) 5/3/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/syslog.h> diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index a665048..2d46089 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -41,12 +42,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * P I N G . C diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c index 4571f67..ff99b74 100644 --- a/sbin/quotacheck/preen.c +++ b/sbin/quotacheck/preen.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)preen.c 8.5 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index 88f042e..e32f84f 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993\n\ @@ -41,12 +42,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)quotacheck.c 8.3 (Berkeley) 1/29/94"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Fix up / report on disk quotas & usage diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 09f52fd..9b3c62d 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1986, 1993\n\ @@ -38,12 +39,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/reboot.h> #include <sys/types.h> diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 23aae0c..85b1985 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1988, 1990, 1993\n\ @@ -38,12 +39,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)shutdown.c 8.4 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c index 26ec6a2..a1df0f4 100644 --- a/sbin/spppcontrol/spppcontrol.c +++ b/sbin/spppcontrol/spppcontrol.c @@ -24,10 +24,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index ae88c8c..063eff4 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1993\n\ @@ -38,12 +39,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/stat.h> #include <sys/param.h> diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index 418fcae..839199b 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1983, 1993\n\ @@ -38,12 +39,11 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * tunefs: change layout parameters to an existing file system. |
