Rename some std/lzw error messages

This commit is contained in:
Nigel Tao committed 2018-06-03 09:28:57 +10:00
1 parent 48a55f5490
commit 6b640bea86
6 files changed
+18 -19

No files matched your search

+2 -2
View File
@@ -1195,8 +1195,8 @@ typedef int32_t wuffs_lzw__status;
#define WUFFS_LZW__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D
#define WUFFS_LZW__SUSPENSION_END_OF_DATA 14 // 0x0000000E
#define WUFFS_LZW__ERROR_CODE_IS_OUT_OF_RANGE -799105024 // 0xD05EA000
#define WUFFS_LZW__ERROR_PREFIX_CHAIN_IS_CYCLICAL -799105023 // 0xD05EA001
#define WUFFS_LZW__ERROR_BAD_CODE -799105024 // 0xD05EA000
#define WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN -799105023 // 0xD05EA001
bool wuffs_lzw__status__is_error(wuffs_lzw__status s);
+6 -6
View File
@@ -1186,8 +1186,8 @@ typedef int32_t wuffs_lzw__status;
#define WUFFS_LZW__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D
#define WUFFS_LZW__SUSPENSION_END_OF_DATA 14 // 0x0000000E
#define WUFFS_LZW__ERROR_CODE_IS_OUT_OF_RANGE -799105024 // 0xD05EA000
#define WUFFS_LZW__ERROR_PREFIX_CHAIN_IS_CYCLICAL -799105023 // 0xD05EA001
#define WUFFS_LZW__ERROR_BAD_CODE -799105024 // 0xD05EA000
#define WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN -799105023 // 0xD05EA001
bool wuffs_lzw__status__is_error(wuffs_lzw__status s);
@@ -1844,8 +1844,8 @@ bool wuffs_lzw__status__is_error(wuffs_lzw__status s) {
}
const char* wuffs_lzw__status__strings[2] = {
"lzw: code is out of range",
"lzw: prefix chain is cyclical",
"lzw: bad code",
"lzw: cyclical prefix chain",
};
const char* wuffs_lzw__status__string(wuffs_lzw__status s) {
@@ -2058,7 +2058,7 @@ wuffs_lzw__status wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self,
while (v_c >= v_clear_code) {
self->private_impl.f_stack[v_s] = self->private_impl.f_suffixes[v_c];
if (v_s == 0) {
status = WUFFS_LZW__ERROR_PREFIX_CHAIN_IS_CYCLICAL;
status = WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN;
goto exit;
}
v_s -= 1;
@@ -2089,7 +2089,7 @@ wuffs_lzw__status wuffs_lzw__decoder__decode(wuffs_lzw__decoder* self,
((uint16_t)(v_prev_code));
}
} else {
status = WUFFS_LZW__ERROR_CODE_IS_OUT_OF_RANGE;
status = WUFFS_LZW__ERROR_BAD_CODE;
goto exit;
}
if (v_save_code <= 4095) {
+2 -2
View File
@@ -1195,8 +1195,8 @@ typedef int32_t wuffs_lzw__status;
#define WUFFS_LZW__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D
#define WUFFS_LZW__SUSPENSION_END_OF_DATA 14 // 0x0000000E
#define WUFFS_LZW__ERROR_CODE_IS_OUT_OF_RANGE -799105024 // 0xD05EA000
#define WUFFS_LZW__ERROR_PREFIX_CHAIN_IS_CYCLICAL -799105023 // 0xD05EA001
#define WUFFS_LZW__ERROR_BAD_CODE -799105024 // 0xD05EA000
#define WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN -799105023 // 0xD05EA001
bool wuffs_lzw__status__is_error(wuffs_lzw__status s);
+2 -2
View File
@@ -1186,8 +1186,8 @@ typedef int32_t wuffs_lzw__status;
#define WUFFS_LZW__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D
#define WUFFS_LZW__SUSPENSION_END_OF_DATA 14 // 0x0000000E
#define WUFFS_LZW__ERROR_CODE_IS_OUT_OF_RANGE -799105024 // 0xD05EA000
#define WUFFS_LZW__ERROR_PREFIX_CHAIN_IS_CYCLICAL -799105023 // 0xD05EA001
#define WUFFS_LZW__ERROR_BAD_CODE -799105024 // 0xD05EA000
#define WUFFS_LZW__ERROR_CYCLICAL_PREFIX_CHAIN -799105023 // 0xD05EA001
bool wuffs_lzw__status__is_error(wuffs_lzw__status s);
+4 -4
View File
@@ -16,8 +16,8 @@ packageid "lzw "
// TODO: some mechanism for fixing the error code's value, such as a trailing
// "= 100", to maintain API stability.
pub error "code is out of range"
pub error "prefix chain is cyclical"
pub error "bad code"
pub error "cyclical prefix chain"
pub struct decoder?(
literal_width base.u32[..8],
@@ -103,7 +103,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader)() {
{
this.stack[s] = this.suffixes[c]
if s == 0 {
return error "prefix chain is cyclical"
return error "cyclical prefix chain"
}
s -= 1
c = this.prefixes[c] as base.u32
@@ -134,7 +134,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader)() {
}
} else {
return error "code is out of range"
return error "bad code"
}
if save_code <= 4095 {
+2 -3
View File
@@ -164,9 +164,8 @@ void test_basic_status_used_package() {
CHECK_FOCUS(__func__);
// The function call here is from "std/gif" but the argument is from
// "std/lzw". The former package depends on the latter.
const char* s0 =
wuffs_gif__status__string(WUFFS_LZW__ERROR_CODE_IS_OUT_OF_RANGE);
const char* t0 = "lzw: code is out of range";
const char* s0 = wuffs_gif__status__string(WUFFS_LZW__ERROR_BAD_CODE);
const char* t0 = "lzw: bad code";
if (strcmp(s0, t0)) {
FAIL("got \"%s\", want \"%s\"", s0, t0);
return;