X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=inflate.c;fp=inflate.c;h=ff2be7e0fecd2dd0884b5fafd4839381e1ac0471;hb=20fcfc81ece044b8b0a6768ec6cf47be4e22a2e6;hp=0d4d14b39135dc6369295c5631000356c4058c69;hpb=d57728a6ca2413a7c564d8b7bb13d9e5a5a180f3;p=debian%2Fgzip diff --git a/inflate.c b/inflate.c index 0d4d14b..ff2be7e 100644 --- a/inflate.c +++ b/inflate.c @@ -1,6 +1,6 @@ /* Inflate deflated data - Copyright (C) 1997-1999, 2002, 2006, 2009-2013 Free Software Foundation, + Copyright (C) 1997-1999, 2002, 2006, 2009-2016 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);}