diff options
Diffstat (limited to 'archival')
-rw-r--r-- | archival/cpio.c | 1 | ||||
-rw-r--r-- | archival/gzip.c | 3 | ||||
-rw-r--r-- | archival/libarchive/bz/compress.c | 1 | ||||
-rw-r--r-- | archival/libarchive/decompress_uncompress.c | 1 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_9x.c | 1 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_dec_lzma2.c | 3 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_dec_stream.c | 2 | ||||
-rw-r--r-- | archival/unzip.c | 2 |
8 files changed, 0 insertions, 14 deletions
diff --git a/archival/cpio.c b/archival/cpio.c index 454648d68..cdc16c14e 100644 --- a/archival/cpio.c +++ b/archival/cpio.c | |||
@@ -257,7 +257,6 @@ static NOINLINE int cpio_o(void) | |||
257 | free(line); | 257 | free(line); |
258 | continue; | 258 | continue; |
259 | } | 259 | } |
260 | |||
261 | } else { /* line == NULL: EOF */ | 260 | } else { /* line == NULL: EOF */ |
262 | next_link: | 261 | next_link: |
263 | if (links) { | 262 | if (links) { |
diff --git a/archival/gzip.c b/archival/gzip.c index 42b2f0b2e..c9171304a 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
@@ -1372,7 +1372,6 @@ static void build_tree(tree_desc * desc) | |||
1372 | /* and insert the new node in the heap */ | 1372 | /* and insert the new node in the heap */ |
1373 | G2.heap[SMALLEST] = node++; | 1373 | G2.heap[SMALLEST] = node++; |
1374 | pqdownheap(tree, SMALLEST); | 1374 | pqdownheap(tree, SMALLEST); |
1375 | |||
1376 | } while (G2.heap_len >= 2); | 1375 | } while (G2.heap_len >= 2); |
1377 | 1376 | ||
1378 | G2.heap[--G2.heap_max] = G2.heap[SMALLEST]; | 1377 | G2.heap[--G2.heap_max] = G2.heap[SMALLEST]; |
@@ -1720,7 +1719,6 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) | |||
1720 | 1719 | ||
1721 | copy_block(buf, (unsigned) stored_len, 0); /* without header */ | 1720 | copy_block(buf, (unsigned) stored_len, 0); /* without header */ |
1722 | G2.compressed_len = stored_len << 3; | 1721 | G2.compressed_len = stored_len << 3; |
1723 | |||
1724 | } else if (stored_len + 4 <= opt_lenb && buf != NULL) { | 1722 | } else if (stored_len + 4 <= opt_lenb && buf != NULL) { |
1725 | /* 4: two words for the lengths */ | 1723 | /* 4: two words for the lengths */ |
1726 | /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. | 1724 | /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. |
@@ -1734,7 +1732,6 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) | |||
1734 | G2.compressed_len += (stored_len + 4) << 3; | 1732 | G2.compressed_len += (stored_len + 4) << 3; |
1735 | 1733 | ||
1736 | copy_block(buf, (unsigned) stored_len, 1); /* with header */ | 1734 | copy_block(buf, (unsigned) stored_len, 1); /* with header */ |
1737 | |||
1738 | } else if (static_lenb == opt_lenb) { | 1735 | } else if (static_lenb == opt_lenb) { |
1739 | send_bits((STATIC_TREES << 1) + eof, 3); | 1736 | send_bits((STATIC_TREES << 1) + eof, 3); |
1740 | compress_block((ct_data *) G2.static_ltree, (ct_data *) G2.static_dtree); | 1737 | compress_block((ct_data *) G2.static_ltree, (ct_data *) G2.static_dtree); |
diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c index 23de9d3f5..2d994685c 100644 --- a/archival/libarchive/bz/compress.c +++ b/archival/libarchive/bz/compress.c | |||
@@ -385,7 +385,6 @@ void sendMTFValues(EState* s) | |||
385 | cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16; | 385 | cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16; |
386 | cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16; | 386 | cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16; |
387 | cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16; | 387 | cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16; |
388 | |||
389 | } else | 388 | } else |
390 | #endif | 389 | #endif |
391 | { | 390 | { |
diff --git a/archival/libarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c index 496d864a7..034ed502d 100644 --- a/archival/libarchive/decompress_uncompress.c +++ b/archival/libarchive/decompress_uncompress.c | |||
@@ -297,7 +297,6 @@ unpack_Z_stream(transformer_state_t *xstate) | |||
297 | /* Remember previous code. */ | 297 | /* Remember previous code. */ |
298 | oldcode = incode; | 298 | oldcode = incode; |
299 | } | 299 | } |
300 | |||
301 | } while (rsize > 0); | 300 | } while (rsize > 0); |
302 | 301 | ||
303 | if (outpos > 0) { | 302 | if (outpos > 0) { |
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c index 2b490ae83..09ee4ba5c 100644 --- a/archival/libarchive/lzo1x_9x.c +++ b/archival/libarchive/lzo1x_9x.c | |||
@@ -71,7 +71,6 @@ typedef struct { | |||
71 | uint8_t *out; | 71 | uint8_t *out; |
72 | 72 | ||
73 | unsigned r1_lit; | 73 | unsigned r1_lit; |
74 | |||
75 | } lzo1x_999_t; | 74 | } lzo1x_999_t; |
76 | 75 | ||
77 | #define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1)) | 76 | #define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1)) |
diff --git a/archival/libarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c index 3c2dc88b7..351251f7c 100644 --- a/archival/libarchive/unxz/xz_dec_lzma2.c +++ b/archival/libarchive/unxz/xz_dec_lzma2.c | |||
@@ -995,10 +995,8 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run( | |||
995 | s->lzma2.need_props = false; | 995 | s->lzma2.need_props = false; |
996 | s->lzma2.next_sequence | 996 | s->lzma2.next_sequence |
997 | = SEQ_PROPERTIES; | 997 | = SEQ_PROPERTIES; |
998 | |||
999 | } else if (s->lzma2.need_props) { | 998 | } else if (s->lzma2.need_props) { |
1000 | return XZ_DATA_ERROR; | 999 | return XZ_DATA_ERROR; |
1001 | |||
1002 | } else { | 1000 | } else { |
1003 | s->lzma2.next_sequence | 1001 | s->lzma2.next_sequence |
1004 | = SEQ_LZMA_PREPARE; | 1002 | = SEQ_LZMA_PREPARE; |
@@ -1080,7 +1078,6 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run( | |||
1080 | 1078 | ||
1081 | rc_reset(&s->rc); | 1079 | rc_reset(&s->rc); |
1082 | s->lzma2.sequence = SEQ_CONTROL; | 1080 | s->lzma2.sequence = SEQ_CONTROL; |
1083 | |||
1084 | } else if (b->out_pos == b->out_size | 1081 | } else if (b->out_pos == b->out_size |
1085 | || (b->in_pos == b->in_size | 1082 | || (b->in_pos == b->in_size |
1086 | && s->temp.size | 1083 | && s->temp.size |
diff --git a/archival/libarchive/unxz/xz_dec_stream.c b/archival/libarchive/unxz/xz_dec_stream.c index bdcbf1ba3..bf791055b 100644 --- a/archival/libarchive/unxz/xz_dec_stream.c +++ b/archival/libarchive/unxz/xz_dec_stream.c | |||
@@ -353,7 +353,6 @@ static enum xz_ret XZ_FUNC crc32_validate(struct xz_dec *s, struct xz_buf *b) | |||
353 | return XZ_DATA_ERROR; | 353 | return XZ_DATA_ERROR; |
354 | 354 | ||
355 | s->pos += 8; | 355 | s->pos += 8; |
356 | |||
357 | } while (s->pos < 32); | 356 | } while (s->pos < 32); |
358 | 357 | ||
359 | s->crc32 = 0; | 358 | s->crc32 = 0; |
@@ -753,7 +752,6 @@ XZ_EXTERN enum xz_ret XZ_FUNC xz_dec_run(struct xz_dec *s, struct xz_buf *b) | |||
753 | b->in_pos = in_start; | 752 | b->in_pos = in_start; |
754 | b->out_pos = out_start; | 753 | b->out_pos = out_start; |
755 | } | 754 | } |
756 | |||
757 | } else if (ret == XZ_OK && in_start == b->in_pos | 755 | } else if (ret == XZ_OK && in_start == b->in_pos |
758 | && out_start == b->out_pos) { | 756 | && out_start == b->out_pos) { |
759 | if (s->allow_buf_error) | 757 | if (s->allow_buf_error) |
diff --git a/archival/unzip.c b/archival/unzip.c index eed225677..f41ab6f44 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
@@ -604,7 +604,6 @@ int unzip_main(int argc, char **argv) | |||
604 | || (zaccept && !find_list_entry(zaccept, dst_fn)) | 604 | || (zaccept && !find_list_entry(zaccept, dst_fn)) |
605 | ) { /* Skip entry */ | 605 | ) { /* Skip entry */ |
606 | i = 'n'; | 606 | i = 'n'; |
607 | |||
608 | } else { | 607 | } else { |
609 | if (listing) { | 608 | if (listing) { |
610 | /* List entry */ | 609 | /* List entry */ |
@@ -666,7 +665,6 @@ int unzip_main(int argc, char **argv) | |||
666 | } | 665 | } |
667 | } | 666 | } |
668 | i = 'n'; | 667 | i = 'n'; |
669 | |||
670 | } else { | 668 | } else { |
671 | /* Extract file */ | 669 | /* Extract file */ |
672 | check_file: | 670 | check_file: |