diff options
author | dwmalone <dwmalone@FreeBSD.org> | 2001-12-10 21:13:08 +0000 |
---|---|---|
committer | dwmalone <dwmalone@FreeBSD.org> | 2001-12-10 21:13:08 +0000 |
commit | d9613ea3837925885145ecab86d9945be73cb303 (patch) | |
tree | 1442452df82ec8f2c59ad6b71923e5a41a2c26fa /usr.bin/cmp | |
parent | 41ac2526112f730a179b27f89b169ad414cd947b (diff) | |
download | FreeBSD-src-d9613ea3837925885145ecab86d9945be73cb303.zip FreeBSD-src-d9613ea3837925885145ecab86d9945be73cb303.tar.gz |
Style improvements recommended by Bruce as a follow up to some
of the recent WARNS commits. The idea is:
1) FreeBSD id tags should follow vendor tags.
2) Vendor tags should not be compiled (though copyrights probably should).
3) There should be no blank line between including cdefs and __FBSDIF.
Diffstat (limited to 'usr.bin/cmp')
-rw-r--r-- | usr.bin/cmp/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/cmp/cmp.c | 11 | ||||
-rw-r--r-- | usr.bin/cmp/misc.c | 11 | ||||
-rw-r--r-- | usr.bin/cmp/regular.c | 11 | ||||
-rw-r--r-- | usr.bin/cmp/special.c | 11 |
5 files changed, 25 insertions, 21 deletions
diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile index 90a4c8e..c6f9ebe 100644 --- a/usr.bin/cmp/Makefile +++ b/usr.bin/cmp/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= cmp SRCS= cmp.c misc.c regular.c special.c diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index 7a3d514..ca732c6 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1987, 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif +#if 0 #ifndef lint -static const char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c index 1d5db6c..1211f3b 100644 --- a/usr.bin/cmp/misc.c +++ b/usr.bin/cmp/misc.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index f8345ca..014657e 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/mman.h> diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c index 5fe0ed1..f08cae5 100644 --- a/usr.bin/cmp/special.c +++ b/usr.bin/cmp/special.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> |