X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=bits.c;h=ab7d2efae987b4742ecc34fdbfd902bc1558e018;hb=80de5593c97eff61f31584362041b5b2432fbe48;hp=995523de37974d5518a8913f72099c44a8dbbdfa;hpb=302189d124ed5849c2589ea92e912eb24fdc4ab3;p=debian%2Fgzip

diff --git a/bits.c b/bits.c
index 995523d..ab7d2ef 100644
--- 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-2018 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.  */
 
 
 /*
@@ -54,16 +67,11 @@
 #include <config.h>
 #include "tailor.h"
 #include "gzip.h"
-#include "crypt.h"
 
 #ifdef DEBUG
 #  include <stdio.h>
 #endif
 
-#ifdef RCSID
-static char rcsid[] = "$Id: bits.c,v 0.9 1993/06/11 10:16:58 jloup Exp $";
-#endif
-
 /* ===========================================================================
  * Local data used by the "bit string" routines.
  */
@@ -85,7 +93,7 @@ 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
@@ -109,7 +117,7 @@ void bi_init (zipfile)
      * for in-memory compression.
      */
     if (zfile != NO_FILE) {
-	read_buf  = file_read;
+        read_buf  = file_read;
     }
 }
 
@@ -187,7 +195,7 @@ 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;
@@ -197,10 +205,6 @@ void copy_block(buf, len, header)
     bits_sent += (off_t)len<<3;
 #endif
     while (len--) {
-#ifdef CRYPT
-        int t;
-	if (key) zencode(*buf, t);
-#endif
-	put_byte(*buf++);
+        put_byte(*buf++);
     }
 }