X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=inflate.c;h=e39f41b32eeda8a395e7dcc17c021099e5f1e345;hb=3707aff878d6063cf0ee515344a074c213207b22;hp=88de0f2d380f9bbf9edacb59b6ce97402f168103;hpb=8b5725caaf7596f7f3ea26ad39cdc0bc02cb2c96;p=debian%2Fgzip diff --git a/inflate.c b/inflate.c index 88de0f2..e39f41b 100644 --- a/inflate.c +++ b/inflate.c @@ -1,6 +1,6 @@ /* Inflate deflated data - Copyright (C) 1997-1999, 2002, 2006, 2009-2014 Free Software Foundation, + Copyright (C) 1997-1999, 2002, 2006, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -116,10 +116,10 @@ */ #include -#include "tailor.h" #include +#include "tailor.h" #include "gzip.h" #define slide window @@ -219,13 +219,7 @@ static ush mask_bits[] = { #define GETBYTE() (inptr < insize ? inbuf[inptr++] : (wp = w, fill_inbuf(0))) -#ifdef CRYPT - uch cc; -# define NEXTBYTE() \ - (decrypt ? (cc = GETBYTE(), zdecode(cc), cc) : GETBYTE()) -#else -# define NEXTBYTE() (uch)GETBYTE() -#endif +#define NEXTBYTE() (uch)GETBYTE() #define NEEDBITS(n) {while(k<(n)){b|=((ulg)NEXTBYTE())<>=(n);k-=(n);}