X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=trees.c;h=3896cf5541682ea7aee6514c6c5cc182aeff8fb2;hb=a45313e80d3dfd7d9e8dbea3a609fb326e5b091b;hp=03c7c02c52e7d3cfd038145b5fb0c2d9b705c9e3;hpb=dc0ab95dbae38577efebe2283fc9b76e92ef4233;p=debian%2Fgzip diff --git a/trees.c b/trees.c index 03c7c02..3896cf5 100644 --- a/trees.c +++ b/trees.c @@ -59,13 +59,12 @@ * void ct_tally (int dist, int lc); * Save the match info and tally the frequency counts. * - * off_t flush_block (char *buf, ulg stored_len, int pad, int eof) + * off_t flush_block (char *buf, ulg stored_len, int eof) * Determine the best encoding for the current block: dynamic trees, * static trees or store, and output the encoded block to the zip - * file. If pad is set, pads the block to the next - * byte. Returns the total compressed length for the file so - * far. - * */ + * file. Returns the total compressed length for the file so far. + * + */ #include #include @@ -857,10 +856,9 @@ local void send_all_trees(lcodes, dcodes, blcodes) * trees or store, and output the encoded block to the zip file. This function * returns the total compressed length for the file so far. */ -off_t flush_block(buf, stored_len, pad, eof) +off_t flush_block(buf, stored_len, eof) char *buf; /* input block, or NULL if too old */ ulg stored_len; /* length of input block */ - int pad; /* pad output to byte boundary */ int eof; /* true if this is the last block for a file */ { ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ @@ -953,10 +951,6 @@ off_t flush_block(buf, stored_len, pad, eof) Assert (input_len == bytes_in, "bad input size"); bi_windup(); compressed_len += 7; /* align on byte boundary */ - } else if (pad && (compressed_len % 8) != 0) { - send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */ - compressed_len = (compressed_len + 3 + 7) & ~7L; - copy_block(buf, 0, 1); /* with header */ } return compressed_len >> 3;