maint: merge build improvements from coreutils

[debian/gzip] / bits.c

diff --git a/bits.c b/bits.c
index 2949ad5d9516c4c0d2b5e648c9bbd05d895cf102..3501b5296fdc40d0d67ca66a03e02d222de5a5df 100644 (file)
--- a/bits.c
+++ b/bits.c
@@ -1,8 +1,21 @@
 /* bits.c -- output variable-length bit strings
- * Copyright (C) 1992-1993 Jean-loup Gailly
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License, see the file COPYING.
- */
+
+   Copyright (C) 1999, 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 1992-1993 Jean-loup Gailly
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
 /*
@@ -51,18 +64,14 @@
  *
  */
 
+#include <config.h>
 #include "tailor.h"
 #include "gzip.h"
-#include "crypt.h"
 
 #ifdef DEBUG
 #  include <stdio.h>
 #endif
 
-#ifdef RCSID
-static char rcsid[] = "$Id$";
-#endif
-
 /* ===========================================================================
  * Local data used by the "bit string" routines.
  */
@@ -84,11 +93,11 @@ local int bi_valid;
  * are always zero.
  */
 
-int (*read_buf) OF((char *buf, unsigned size));
+int (*read_buf) (char *buf, unsigned size);
 /* Current input function. Set to mem_read for in-memory compression */
 
 #ifdef DEBUG
-  ulg bits_sent;   /* bit length of the compressed data */
+  off_t bits_sent;   /* bit length of the compressed data */
 #endif
 
 /* ===========================================================================
@@ -108,7 +117,7 @@ void bi_init (zipfile)
      * for in-memory compression.
      */
     if (zfile != NO_FILE) {
-       read_buf  = file_read;
+        read_buf  = file_read;
     }
 }
 
@@ -123,7 +132,7 @@ void send_bits(value, length)
 #ifdef DEBUG
     Tracev((stderr," l %2d v %4x ", length, value));
     Assert(length > 0 && length <= 15, "invalid length");
-    bits_sent += (ulg)length;
+    bits_sent += (off_t)length;
 #endif
     /* If not enough room in bi_buf, use (valid) bits from bi_buf and
      * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
@@ -186,20 +195,20 @@ void copy_block(buf, len, header)
     bi_windup();              /* align on byte boundary */
 
     if (header) {
-        put_short((ush)len);   
+        put_short((ush)len);
         put_short((ush)~len);
 #ifdef DEBUG
         bits_sent += 2*16;
 #endif
     }
 #ifdef DEBUG
-    bits_sent += (ulg)len<<3;
+    bits_sent += (off_t)len<<3;
 #endif
     while (len--) {
 #ifdef CRYPT
         int t;
-       if (key) zencode(*buf, t);
+        if (key) zencode(*buf, t);
 #endif
-       put_byte(*buf++);
+        put_byte(*buf++);
     }
 }