From d9613ea3837925885145ecab86d9945be73cb303 Mon Sep 17 00:00:00 2001
From: dwmalone <dwmalone@FreeBSD.org>
Date: Mon, 10 Dec 2001 21:13:08 +0000
Subject: 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.
---
 usr.bin/compress/compress.c | 11 ++++++-----
 usr.bin/compress/zopen.c    |  7 +++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'usr.bin/compress')

diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index ebb6c79..9b814eb 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
+static char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index b8beb7e..1251d1b 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -35,14 +35,13 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)zopen.c	8.1 (Berkeley) 6/27/93";
 #endif /* LIBC_SCCS and not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*-
  * fcompress.c - File compression ala IEEE Computer, June 1984.
  *
-- 
cgit v1.1