X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=bits.c;h=374b49b032d1af8a5f5c865531878130f33daca7;hb=bc7ecfcc001fe21254fff0709cbd2bdb217e846d;hp=fb0408b97a4f7d7002457a3eccd864584b77bb19;hpb=03167e0cea52f915ea63566a76d76e68659542e8;p=debian%2Fgzip diff --git a/bits.c b/bits.c index fb0408b..374b49b 100644 --- a/bits.c +++ b/bits.c @@ -1,11 +1,11 @@ /* bits.c -- output variable-length bit strings - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2009-2016 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 2, or (at your option) + 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, @@ -67,16 +67,11 @@ #include #include "tailor.h" #include "gzip.h" -#include "crypt.h" #ifdef DEBUG # include #endif -#ifdef RCSID -static char rcsid[] = "$Id$"; -#endif - /* =========================================================================== * Local data used by the "bit string" routines. */ @@ -98,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 @@ -122,7 +117,7 @@ void bi_init (zipfile) * for in-memory compression. */ if (zfile != NO_FILE) { - read_buf = file_read; + read_buf = file_read; } } @@ -210,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++); } }