Merge branch 'busybox' into merge

5 files changed, 0 insertions, 8 deletions

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)