Remove some redundancy in error messages

This commit is contained in:
Nigel Tao committed 2018-05-03 11:51:55 +10:00
1 parent 37ca5e8504
commit ee777d66c5
13 files changed
+97 -101

No files matched your search

+5 -5
View File
@@ -1071,9 +1071,9 @@ typedef int32_t wuffs_deflate__status;
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1278585852 // 0xB3CA5404
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \
-1278585851 // 0xB3CA5405
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585850 // 0xB3CA5406
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585849 // 0xB3CA5407
#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1278585848 // 0xB3CA5408
#define WUFFS_DEFLATE__ERROR_BAD_BLOCK -1278585850 // 0xB3CA5406
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585849 // 0xB3CA5407
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585848 // 0xB3CA5408
#define WUFFS_DEFLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \
-1278585847 // 0xB3CA5409
#define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \
@@ -1687,9 +1687,9 @@ const char* wuffs_deflate__status__strings[17] = {
"deflate: bad Huffman code length repetition",
"deflate: bad Huffman code",
"deflate: bad Huffman minimum code length",
"deflate: bad block",
"deflate: bad distance",
"deflate: bad distance code count",
"deflate: bad flate block",
"deflate: bad literal/length code count",
"deflate: inconsistent stored block length",
"deflate: missing end-of-block code",
@@ -2042,7 +2042,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks(
goto suspend;
}
} else {
status = WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK;
status = WUFFS_DEFLATE__ERROR_BAD_BLOCK;
goto exit;
}
self->private_impl.f_end_of_block = false;
+11 -11
View File
@@ -1059,10 +1059,10 @@ typedef int32_t wuffs_gif__status;
#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_GIF__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xBE161800
#define WUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xBE161801
#define WUFFS_GIF__ERROR_BAD_GIF_HEADER -1105848318 // 0xBE161802
#define WUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xBE161803
#define WUFFS_GIF__ERROR_BAD_BLOCK -1105848320 // 0xBE161800
#define WUFFS_GIF__ERROR_BAD_EXTENSION_LABEL -1105848319 // 0xBE161801
#define WUFFS_GIF__ERROR_BAD_HEADER -1105848318 // 0xBE161802
#define WUFFS_GIF__ERROR_BAD_LITERAL_WIDTH -1105848317 // 0xBE161803
#define WUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848316 // 0xBE161804
#define WUFFS_GIF__ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848315 // 0xBE161805
@@ -1697,10 +1697,10 @@ bool wuffs_gif__status__is_error(wuffs_gif__status s) {
}
const char* wuffs_gif__status__strings[6] = {
"gif: bad GIF block",
"gif: bad GIF extension label",
"gif: bad GIF header",
"gif: bad LZW literal width",
"gif: bad block",
"gif: bad extension label",
"gif: bad header",
"gif: bad literal width",
"gif: LZW code is out of range",
"gif: LZW prefix chain is cyclical",
};
@@ -2030,7 +2030,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame(
} else if (self->private_impl.f_block_type == 59) {
goto label_0_break;
} else {
status = WUFFS_GIF__ERROR_BAD_GIF_BLOCK;
status = WUFFS_GIF__ERROR_BAD_BLOCK;
goto exit;
}
}
@@ -2119,7 +2119,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_header(
}
if ((v_c[0] != 71) || (v_c[1] != 73) || (v_c[2] != 70) || (v_c[3] != 56) ||
((v_c[4] != 55) && (v_c[4] != 57)) || (v_c[5] != 97)) {
status = WUFFS_GIF__ERROR_BAD_GIF_HEADER;
status = WUFFS_GIF__ERROR_BAD_HEADER;
goto exit;
}
@@ -2872,7 +2872,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
v_lw = t_12;
}
if ((v_lw < 2) || (8 < v_lw)) {
status = WUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH;
status = WUFFS_GIF__ERROR_BAD_LITERAL_WIDTH;
goto exit;
}
wuffs_gif__lzw_decoder__set_literal_width(&self->private_impl.f_lzw,
+14 -15
View File
@@ -1170,9 +1170,9 @@ typedef int32_t wuffs_deflate__status;
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1278585852 // 0xB3CA5404
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \
-1278585851 // 0xB3CA5405
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585850 // 0xB3CA5406
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585849 // 0xB3CA5407
#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1278585848 // 0xB3CA5408
#define WUFFS_DEFLATE__ERROR_BAD_BLOCK -1278585850 // 0xB3CA5406
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585849 // 0xB3CA5407
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585848 // 0xB3CA5408
#define WUFFS_DEFLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \
-1278585847 // 0xB3CA5409
#define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \
@@ -1331,11 +1331,10 @@ typedef int32_t wuffs_gzip__status;
#define WUFFS_GZIP__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_GZIP__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_GZIP__ERROR_BAD_GZIP_HEADER -1080566784 // 0xBF97DC00
#define WUFFS_GZIP__ERROR_CHECKSUM_MISMATCH -1080566783 // 0xBF97DC01
#define WUFFS_GZIP__ERROR_INVALID_GZIP_COMPRESSION_METHOD \
-1080566782 // 0xBF97DC02
#define WUFFS_GZIP__ERROR_INVALID_GZIP_ENCODING_FLAGS -1080566781 // 0xBF97DC03
#define WUFFS_GZIP__ERROR_BAD_HEADER -1080566784 // 0xBF97DC00
#define WUFFS_GZIP__ERROR_CHECKSUM_MISMATCH -1080566783 // 0xBF97DC01
#define WUFFS_GZIP__ERROR_INVALID_COMPRESSION_METHOD -1080566782 // 0xBF97DC02
#define WUFFS_GZIP__ERROR_INVALID_ENCODING_FLAGS -1080566781 // 0xBF97DC03
bool wuffs_gzip__status__is_error(wuffs_gzip__status s);
@@ -1885,10 +1884,10 @@ bool wuffs_gzip__status__is_error(wuffs_gzip__status s) {
}
const char* wuffs_gzip__status__strings[4] = {
"gzip: bad gzip header",
"gzip: bad header",
"gzip: checksum mismatch",
"gzip: invalid gzip compression method",
"gzip: invalid gzip encoding flags",
"gzip: invalid compression method",
"gzip: invalid encoding flags",
};
const char* wuffs_gzip__status__string(wuffs_gzip__status s) {
@@ -2037,7 +2036,7 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self,
}
uint8_t t_0 = *b_rptr_src++;
if (t_0 != 31) {
status = WUFFS_GZIP__ERROR_BAD_GZIP_HEADER;
status = WUFFS_GZIP__ERROR_BAD_HEADER;
goto exit;
}
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
@@ -2046,7 +2045,7 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self,
}
uint8_t t_1 = *b_rptr_src++;
if (t_1 != 139) {
status = WUFFS_GZIP__ERROR_BAD_GZIP_HEADER;
status = WUFFS_GZIP__ERROR_BAD_HEADER;
goto exit;
}
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
@@ -2055,7 +2054,7 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self,
}
uint8_t t_2 = *b_rptr_src++;
if (t_2 != 8) {
status = WUFFS_GZIP__ERROR_INVALID_GZIP_COMPRESSION_METHOD;
status = WUFFS_GZIP__ERROR_INVALID_COMPRESSION_METHOD;
goto exit;
}
{
@@ -2159,7 +2158,7 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self,
b_rptr_src += self->private_impl.c_decode[0].scratch;
}
if ((v_flags & 224) != 0) {
status = WUFFS_GZIP__ERROR_INVALID_GZIP_ENCODING_FLAGS;
status = WUFFS_GZIP__ERROR_INVALID_ENCODING_FLAGS;
goto exit;
}
v_checksum_got = 0;
+17 -18
View File
@@ -1171,9 +1171,9 @@ typedef int32_t wuffs_deflate__status;
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1278585852 // 0xB3CA5404
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \
-1278585851 // 0xB3CA5405
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585850 // 0xB3CA5406
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585849 // 0xB3CA5407
#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1278585848 // 0xB3CA5408
#define WUFFS_DEFLATE__ERROR_BAD_BLOCK -1278585850 // 0xB3CA5406
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585849 // 0xB3CA5407
#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585848 // 0xB3CA5408
#define WUFFS_DEFLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \
-1278585847 // 0xB3CA5409
#define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \
@@ -1332,13 +1332,12 @@ typedef int32_t wuffs_zlib__status;
#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH -33692672 // 0xFDFDE400
#define WUFFS_ZLIB__ERROR_INVALID_ZLIB_COMPRESSION_METHOD \
-33692671 // 0xFDFDE401
#define WUFFS_ZLIB__ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE \
-33692670 // 0xFDFDE402
#define WUFFS_ZLIB__ERROR_INVALID_ZLIB_PARITY_CHECK -33692669 // 0xFDFDE403
#define WUFFS_ZLIB__ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY \
#define WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH -33692672 // 0xFDFDE400
#define WUFFS_ZLIB__ERROR_INVALID_COMPRESSION_METHOD -33692671 // 0xFDFDE401
#define WUFFS_ZLIB__ERROR_INVALID_COMPRESSION_WINDOW_SIZE \
-33692670 // 0xFDFDE402
#define WUFFS_ZLIB__ERROR_INVALID_PARITY_CHECK -33692669 // 0xFDFDE403
#define WUFFS_ZLIB__ERROR_TODO_UNSUPPORTED_PRESET_DICTIONARY \
-33692668 // 0xFDFDE404
bool wuffs_zlib__status__is_error(wuffs_zlib__status s);
@@ -1886,10 +1885,10 @@ bool wuffs_zlib__status__is_error(wuffs_zlib__status s) {
const char* wuffs_zlib__status__strings[5] = {
"zlib: checksum mismatch",
"zlib: invalid zlib compression method",
"zlib: invalid zlib compression window size",
"zlib: invalid zlib parity check",
"zlib: TODO: unsupported zlib preset dictionary",
"zlib: invalid compression method",
"zlib: invalid compression window size",
"zlib: invalid parity check",
"zlib: TODO: unsupported preset dictionary",
};
const char* wuffs_zlib__status__string(wuffs_zlib__status s) {
@@ -2051,19 +2050,19 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
v_x = t_1;
}
if (((v_x >> 8) & 15) != 8) {
status = WUFFS_ZLIB__ERROR_INVALID_ZLIB_COMPRESSION_METHOD;
status = WUFFS_ZLIB__ERROR_INVALID_COMPRESSION_METHOD;
goto exit;
}
if ((v_x >> 12) > 7) {
status = WUFFS_ZLIB__ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE;
status = WUFFS_ZLIB__ERROR_INVALID_COMPRESSION_WINDOW_SIZE;
goto exit;
}
if ((v_x & 32) != 0) {
status = WUFFS_ZLIB__ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY;
status = WUFFS_ZLIB__ERROR_TODO_UNSUPPORTED_PRESET_DICTIONARY;
goto exit;
}
if ((v_x % 31) != 0) {
status = WUFFS_ZLIB__ERROR_INVALID_ZLIB_PARITY_CHECK;
status = WUFFS_ZLIB__ERROR_INVALID_PARITY_CHECK;
goto exit;
}
v_checksum_got = 0;