Strip the prefix from base status messages

This commit is contained in:
Nigel Tao committed 2017-12-27 14:45:54 +11:00
1 parent 7e47f4cc7a
commit f5c6204f09
7 files changed
+80 -84

No files matched your search

+18 -18
View File
@@ -623,6 +623,20 @@ static inline wuffs_base__empty_struct wuffs_base__writer1__mark(
return ((wuffs_base__empty_struct){});
}
static const char* wuffs_base__status__strings[11] = {
"ok",
"bad wuffs version",
"bad receiver",
"bad argument",
"initializer not called",
"invalid I/O operation",
"closed for writes",
"unexpected EOF",
"short read",
"short write",
"cannot return a suspension",
};
#endif // WUFFS_BASE_IMPL_H
// ---------------- Status Codes Implementations
@@ -631,21 +645,7 @@ bool wuffs_deflate__status__is_error(wuffs_deflate__status s) {
return s < 0;
}
const char* wuffs_deflate__status__strings0[11] = {
"deflate: ok",
"deflate: bad wuffs version",
"deflate: bad receiver",
"deflate: bad argument",
"deflate: initializer not called",
"deflate: invalid I/O operation",
"deflate: closed for writes",
"deflate: unexpected EOF",
"deflate: short read",
"deflate: short write",
"deflate: cannot return a suspension",
};
const char* wuffs_deflate__status__strings1[17] = {
const char* wuffs_deflate__status__strings[17] = {
"deflate: bad Huffman code (over-subscribed)",
"deflate: bad Huffman code (under-subscribed)",
"deflate: bad Huffman code length count",
@@ -670,16 +670,16 @@ const char* wuffs_deflate__status__string(wuffs_deflate__status s) {
uint32_t n = 0;
switch ((s >> 10) & 0x1FFFFF) {
case 0:
a = wuffs_deflate__status__strings0;
a = wuffs_base__status__strings;
n = 11;
break;
case wuffs_deflate__packageid:
a = wuffs_deflate__status__strings1;
a = wuffs_deflate__status__strings;
n = 17;
break;
}
uint32_t i = s & 0xFF;
return i < n ? a[i] : "deflate: unknown status";
return i < n ? a[i] : "unknown status";
}
// ---------------- Private Consts
+18 -18
View File
@@ -611,6 +611,20 @@ static inline wuffs_base__empty_struct wuffs_base__writer1__mark(
return ((wuffs_base__empty_struct){});
}
static const char* wuffs_base__status__strings[11] = {
"ok",
"bad wuffs version",
"bad receiver",
"bad argument",
"initializer not called",
"invalid I/O operation",
"closed for writes",
"unexpected EOF",
"short read",
"short write",
"cannot return a suspension",
};
#endif // WUFFS_BASE_IMPL_H
// ---------------- Status Codes Implementations
@@ -619,21 +633,7 @@ bool wuffs_gif__status__is_error(wuffs_gif__status s) {
return s < 0;
}
const char* wuffs_gif__status__strings0[11] = {
"gif: ok",
"gif: bad wuffs version",
"gif: bad receiver",
"gif: bad argument",
"gif: initializer not called",
"gif: invalid I/O operation",
"gif: closed for writes",
"gif: unexpected EOF",
"gif: short read",
"gif: short write",
"gif: cannot return a suspension",
};
const char* wuffs_gif__status__strings1[8] = {
const char* wuffs_gif__status__strings[8] = {
"gif: bad GIF block",
"gif: bad GIF extension label",
"gif: bad GIF header",
@@ -649,16 +649,16 @@ const char* wuffs_gif__status__string(wuffs_gif__status s) {
uint32_t n = 0;
switch ((s >> 10) & 0x1FFFFF) {
case 0:
a = wuffs_gif__status__strings0;
a = wuffs_base__status__strings;
n = 11;
break;
case wuffs_gif__packageid:
a = wuffs_gif__status__strings1;
a = wuffs_gif__status__strings;
n = 8;
break;
}
uint32_t i = s & 0xFF;
return i < n ? a[i] : "gif: unknown status";
return i < n ? a[i] : "unknown status";
}
// ---------------- Private Consts
+18 -18
View File
@@ -746,6 +746,20 @@ static inline wuffs_base__empty_struct wuffs_base__writer1__mark(
return ((wuffs_base__empty_struct){});
}
static const char* wuffs_base__status__strings[11] = {
"ok",
"bad wuffs version",
"bad receiver",
"bad argument",
"initializer not called",
"invalid I/O operation",
"closed for writes",
"unexpected EOF",
"short read",
"short write",
"cannot return a suspension",
};
#endif // WUFFS_BASE_IMPL_H
// ---------------- Status Codes Implementations
@@ -754,21 +768,7 @@ bool wuffs_zlib__status__is_error(wuffs_zlib__status s) {
return s < 0;
}
const char* wuffs_zlib__status__strings0[11] = {
"zlib: ok",
"zlib: bad wuffs version",
"zlib: bad receiver",
"zlib: bad argument",
"zlib: initializer not called",
"zlib: invalid I/O operation",
"zlib: closed for writes",
"zlib: unexpected EOF",
"zlib: short read",
"zlib: short write",
"zlib: cannot return a suspension",
};
const char* wuffs_zlib__status__strings1[5] = {
const char* wuffs_zlib__status__strings[5] = {
"zlib: checksum mismatch",
"zlib: invalid zlib compression method",
"zlib: invalid zlib compression window size",
@@ -781,18 +781,18 @@ const char* wuffs_zlib__status__string(wuffs_zlib__status s) {
uint32_t n = 0;
switch ((s >> 10) & 0x1FFFFF) {
case 0:
a = wuffs_zlib__status__strings0;
a = wuffs_base__status__strings;
n = 11;
break;
case wuffs_zlib__packageid:
a = wuffs_zlib__status__strings1;
a = wuffs_zlib__status__strings;
n = 5;
break;
case wuffs_deflate__packageid:
return wuffs_deflate__status__string(s);
}
uint32_t i = s & 0xFF;
return i < n ? a[i] : "zlib: unknown status";
return i < n ? a[i] : "unknown status";
}
// ---------------- Private Consts