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) free(line); continue; } - } else { /* line == NULL: EOF */ next_link: 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) /* and insert the new node in the heap */ G2.heap[SMALLEST] = node++; pqdownheap(tree, SMALLEST); - } while (G2.heap_len >= 2); G2.heap[--G2.heap_max] = G2.heap[SMALLEST]; @@ -1720,7 +1719,6 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) copy_block(buf, (unsigned) stored_len, 0); /* without header */ G2.compressed_len = stored_len << 3; - } else if (stored_len + 4 <= opt_lenb && buf != NULL) { /* 4: two words for the lengths */ /* 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) G2.compressed_len += (stored_len + 4) << 3; copy_block(buf, (unsigned) stored_len, 1); /* with header */ - } else if (static_lenb == opt_lenb) { send_bits((STATIC_TREES << 1) + eof, 3); 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) cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16; cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16; cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16; - } else #endif { 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) /* Remember previous code. */ oldcode = incode; } - } while (rsize > 0); 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 { uint8_t *out; unsigned r1_lit; - } lzo1x_999_t; #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( s->lzma2.need_props = false; s->lzma2.next_sequence = SEQ_PROPERTIES; - } else if (s->lzma2.need_props) { return XZ_DATA_ERROR; - } else { s->lzma2.next_sequence = SEQ_LZMA_PREPARE; @@ -1080,7 +1078,6 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run( rc_reset(&s->rc); s->lzma2.sequence = SEQ_CONTROL; - } else if (b->out_pos == b->out_size || (b->in_pos == b->in_size && 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) return XZ_DATA_ERROR; s->pos += 8; - } while (s->pos < 32); 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) b->in_pos = in_start; b->out_pos = out_start; } - } else if (ret == XZ_OK && in_start == b->in_pos && out_start == b->out_pos) { 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) || (zaccept && !find_list_entry(zaccept, dst_fn)) ) { /* Skip entry */ i = 'n'; - } else { if (listing) { /* List entry */ @@ -666,7 +665,6 @@ int unzip_main(int argc, char **argv) } } i = 'n'; - } else { /* Extract file */ check_file: |