aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/cmp
diff options
context:
space:
mode:
authorDavid Malone <dwmalone@FreeBSD.org>2001-12-10 21:13:08 +0000
committerDavid Malone <dwmalone@FreeBSD.org>2001-12-10 21:13:08 +0000
commit9f5b04e925d068b053cc41bae3d3c25a5325062c (patch)
tree1442452df82ec8f2c59ad6b71923e5a41a2c26fa /usr.bin/cmp
parent071087f3d79814821e1c6b70569177f2583903a8 (diff)
downloadsrc-9f5b04e925d068b053cc41bae3d3c25a5325062c.tar.gz
src-9f5b04e925d068b053cc41bae3d3c25a5325062c.zip
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.
Notes
Notes: svn path=/head/; revision=87628
Diffstat (limited to 'usr.bin/cmp')
-rw-r--r--usr.bin/cmp/Makefile2
-rw-r--r--usr.bin/cmp/cmp.c11
-rw-r--r--usr.bin/cmp/misc.c11
-rw-r--r--usr.bin/cmp/regular.c11
-rw-r--r--usr.bin/cmp/special.c11
5 files changed, 25 insertions, 21 deletions
diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile
index 90a4c8e17c20..c6f9ebebe2e4 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 7a3d514a7fd8..ca732c6325e5 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 1d5db6cf4491..1211f3b6f3b4 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 f8345cab2519..014657e45987 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 5fe0ed18b09f..f08cae58fcb8 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>