From fc99e4f7656bd9104582ef9a71d1945928a186be Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Sun, 2 Dec 2001 23:58:38 +0000
Subject: Use __FBSDID(). Use a better choice than size_t for vertain
 variables. Fix some comment alignment.

---
 usr.bin/compress/compress.c | 12 ++++++------
 usr.bin/compress/zopen.c    | 14 ++++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'usr.bin/compress')

diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 24048eb..ebb6c79 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -31,19 +31,19 @@
  * 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 /* not lint */
+#endif
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
+static const char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 35e00b0..b8beb7e 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -33,10 +33,12 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#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 */
@@ -103,8 +105,8 @@ struct s_zstate {
 	enum {
 		S_START, S_MIDDLE, S_EOF
 	} zs_state;			/* State of computation */
-	size_t zs_n_bits;			/* Number of bits/code. */
-	size_t zs_maxbits;			/* User settable max # bits/code. */
+	u_int zs_n_bits;		/* Number of bits/code. */
+	u_int zs_maxbits;		/* User settable max # bits/code. */
 	code_int zs_maxcode;		/* Maximum code, given n_bits. */
 	code_int zs_maxmaxcode;		/* Should NEVER generate this code. */
 	count_int zs_htab [HSIZE];
@@ -119,7 +121,7 @@ struct s_zstate {
 	int zs_clear_flg;
 	long zs_ratio;
 	count_int zs_checkpoint;
-	size_t zs_offset;
+	u_int zs_offset;
 	long zs_in_count;		/* Length of input. */
 	long zs_bytes_out;		/* Length of compressed output. */
 	long zs_out_count;		/* # of codes output (for debugging). */
@@ -377,7 +379,7 @@ output(zs, ocode)
 	code_int ocode;
 {
 	int r_off;
-	size_t bits;
+	u_int bits;
 	char_type *bp;
 
 	r_off = offset;
-- 
cgit v1.1