aboutsummaryrefslogtreecommitdiff
path: root/archival/libarchive/unxz
diff options
context:
space:
mode:
authorManinder Singh <maninder1.s@samsung.com>2015-06-10 03:47:27 +0000
committerDenys Vlasenko <vda.linux@googlemail.com>2015-07-13 03:25:46 +0200
commit97f2f7ca7fe10783a592087df989a7f394492fa1 (patch)
tree4d70075a3771a6fb2d06d8cdd3e421474d7ce779 /archival/libarchive/unxz
parentb7ee7e1e13fa4a680e8b228bd158e7aa53fe342a (diff)
downloadbusybox-w32-97f2f7ca7fe10783a592087df989a7f394492fa1.tar.gz
busybox-w32-97f2f7ca7fe10783a592087df989a7f394492fa1.tar.bz2
busybox-w32-97f2f7ca7fe10783a592087df989a7f394492fa1.zip
Removes stray empty line from code
This patch removes stray empty line from busybox code reported by script find_stray_empty_lines Signed-off-by: Maninder Singh <maninder1.s@samsung.com> Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libarchive/unxz')
-rw-r--r--archival/libarchive/unxz/xz_dec_lzma2.c3
-rw-r--r--archival/libarchive/unxz/xz_dec_stream.c2
2 files changed, 0 insertions, 5 deletions
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)