X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=inflate.c;h=d372685ae995102255010a612a3b156c7aa0b752;hb=ecea6a7078983379e5b4d8961337cc55298aa8b1;hp=d5a8dfff5c54596ffcc58795ff25b8ec995844eb;hpb=dc84183747ce1703eb99685b5dbde1f65a143c06;p=debian%2Fgzip diff --git a/inflate.c b/inflate.c index d5a8dff..d372685 100644 --- a/inflate.c +++ b/inflate.c @@ -1,6 +1,6 @@ /* Inflate deflated data - Copyright (C) 1997-1999, 2002, 2006, 2009-2012 Free Software Foundation, + Copyright (C) 1997-1999, 2002, 2006, 2009-2018 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);}