diff options
Diffstat (limited to 'archival/lzop.c')
-rw-r--r-- | archival/lzop.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/archival/lzop.c b/archival/lzop.c index 585632c4e..bdd21598c 100644 --- a/archival/lzop.c +++ b/archival/lzop.c | |||
@@ -752,7 +752,7 @@ static FAST_FUNC void lzo_check( | |||
752 | */ | 752 | */ |
753 | uint32_t c = fn(init, buf, len); | 753 | uint32_t c = fn(init, buf, len); |
754 | if (c != ref) | 754 | if (c != ref) |
755 | bb_error_msg_and_die("checksum error"); | 755 | bb_simple_error_msg_and_die("checksum error"); |
756 | } | 756 | } |
757 | 757 | ||
758 | /**********************************************************************/ | 758 | /**********************************************************************/ |
@@ -785,15 +785,15 @@ static NOINLINE int lzo_decompress(uint32_t h_flags32) | |||
785 | /* error if split file */ | 785 | /* error if split file */ |
786 | if (dst_len == 0xffffffffL) | 786 | if (dst_len == 0xffffffffL) |
787 | /* should not happen - not yet implemented */ | 787 | /* should not happen - not yet implemented */ |
788 | bb_error_msg_and_die("this file is a split lzop file"); | 788 | bb_simple_error_msg_and_die("this file is a split lzop file"); |
789 | 789 | ||
790 | if (dst_len > MAX_BLOCK_SIZE) | 790 | if (dst_len > MAX_BLOCK_SIZE) |
791 | bb_error_msg_and_die("corrupted data"); | 791 | bb_simple_error_msg_and_die("corrupted data"); |
792 | 792 | ||
793 | /* read compressed block size */ | 793 | /* read compressed block size */ |
794 | src_len = read32(); | 794 | src_len = read32(); |
795 | if (src_len <= 0 || src_len > dst_len) | 795 | if (src_len <= 0 || src_len > dst_len) |
796 | bb_error_msg_and_die("corrupted data"); | 796 | bb_simple_error_msg_and_die("corrupted data"); |
797 | 797 | ||
798 | if (dst_len > block_size) { | 798 | if (dst_len > block_size) { |
799 | if (b2) { | 799 | if (b2) { |
@@ -846,7 +846,7 @@ static NOINLINE int lzo_decompress(uint32_t h_flags32) | |||
846 | r = lzo1x_decompress_safe(b1, src_len, b2, &d /*, NULL*/); | 846 | r = lzo1x_decompress_safe(b1, src_len, b2, &d /*, NULL*/); |
847 | 847 | ||
848 | if (r != 0 /*LZO_E_OK*/ || dst_len != d) { | 848 | if (r != 0 /*LZO_E_OK*/ || dst_len != d) { |
849 | bb_error_msg_and_die("corrupted data"); | 849 | bb_simple_error_msg_and_die("corrupted data"); |
850 | } | 850 | } |
851 | dst = b2; | 851 | dst = b2; |
852 | } else { | 852 | } else { |
@@ -913,7 +913,7 @@ static void check_magic(void) | |||
913 | unsigned char magic[sizeof(lzop_magic)]; | 913 | unsigned char magic[sizeof(lzop_magic)]; |
914 | xread(0, magic, sizeof(magic)); | 914 | xread(0, magic, sizeof(magic)); |
915 | if (memcmp(magic, lzop_magic, sizeof(lzop_magic)) != 0) | 915 | if (memcmp(magic, lzop_magic, sizeof(lzop_magic)) != 0) |
916 | bb_error_msg_and_die("bad magic number"); | 916 | bb_simple_error_msg_and_die("bad magic number"); |
917 | } | 917 | } |
918 | 918 | ||
919 | /**********************************************************************/ | 919 | /**********************************************************************/ |
@@ -1049,7 +1049,7 @@ static void lzo_set_method(header_t *h) | |||
1049 | else if (option_mask32 & OPT_8) | 1049 | else if (option_mask32 & OPT_8) |
1050 | level = 8; | 1050 | level = 8; |
1051 | #else | 1051 | #else |
1052 | bb_error_msg_and_die("high compression not compiled in"); | 1052 | bb_simple_error_msg_and_die("high compression not compiled in"); |
1053 | #endif | 1053 | #endif |
1054 | } | 1054 | } |
1055 | 1055 | ||