aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/lzo1x_9x.c2
-rw-r--r--archival/lzop.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/archival/lzo1x_9x.c b/archival/lzo1x_9x.c
index d30e2e7d1..f2d4fac1b 100644
--- a/archival/lzo1x_9x.c
+++ b/archival/lzo1x_9x.c
@@ -304,7 +304,7 @@ static void swd_search(lzo_swd_p s, unsigned node, unsigned cnt)
304 p2[1] == p1[1]) { 304 p2[1] == p1[1]) {
305 unsigned i; 305 unsigned i;
306 assert(lzo_memcmp(bp,&b[node],3) == 0); 306 assert(lzo_memcmp(bp,&b[node],3) == 0);
307 307
308 p1 += 2; p2 += 2; 308 p1 += 2; p2 += 2;
309 do {} while (++p1 < px && *p1 == *++p2); 309 do {} while (++p1 < px && *p1 == *++p2);
310 i = p1-bp; 310 i = p1-bp;
diff --git a/archival/lzop.c b/archival/lzop.c
index a30d5e78b..b4757e86d 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -856,7 +856,7 @@ static const unsigned char lzop_magic[9] = {
856/* This coding is derived from Alexander Lehmann's pngcheck code. */ 856/* This coding is derived from Alexander Lehmann's pngcheck code. */
857static void check_magic(void) 857static void check_magic(void)
858{ 858{
859 unsigned char magic[sizeof(lzop_magic)]; 859 unsigned char magic[sizeof(lzop_magic)];
860 xread(0, magic, sizeof(magic)); 860 xread(0, magic, sizeof(magic));
861 if (memcmp(magic, lzop_magic, sizeof(lzop_magic)) != 0) 861 if (memcmp(magic, lzop_magic, sizeof(lzop_magic)) != 0)
862 bb_error_msg_and_die("bad magic number"); 862 bb_error_msg_and_die("bad magic number");
@@ -948,7 +948,7 @@ static int read_header(header_t *h)
948 /* skip extra field [not used yet] */ 948 /* skip extra field [not used yet] */
949 if (h->flags & F_H_EXTRA_FIELD) { 949 if (h->flags & F_H_EXTRA_FIELD) {
950 uint32_t k; 950 uint32_t k;
951 951
952 /* note: the checksum also covers the length */ 952 /* note: the checksum also covers the length */
953 init_chksum(&G.chksum_in); 953 init_chksum(&G.chksum_in);
954 h->extra_field_len = f_read32(); 954 h->extra_field_len = f_read32();
@@ -1033,7 +1033,7 @@ static smallint do_lzo_compress(void)
1033static smallint do_lzo_decompress(void) 1033static smallint do_lzo_decompress(void)
1034{ 1034{
1035 header_t header; 1035 header_t header;
1036 1036
1037 check_magic(); 1037 check_magic();
1038 p_header(&header); 1038 p_header(&header);
1039 return lzo_decompress(&header); 1039 return lzo_decompress(&header);