Remove the wuffs_foo__status types

This commit is contained in:
Nigel Tao committed 2018-06-10 21:40:43 +10:00
1 parent 699bae15d2
commit d770e879ab
28 files changed
+221 -361

No files matched your search

+17 -34
View File
@@ -1278,8 +1278,6 @@ extern "C" {
// ---------------- Status Codes
typedef int32_t wuffs_adler32__status;
#define wuffs_adler32__packageid 681002 // 0x000A642A
#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000
@@ -1301,9 +1299,7 @@ typedef int32_t wuffs_adler32__status;
#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -301989888 // 0xEE000000
#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 16777216 // 0x01000000
bool wuffs_adler32__status__is_error(wuffs_adler32__status s);
const char* wuffs_adler32__status__string(wuffs_adler32__status s);
const char* wuffs_adler32__status__string(wuffs_base__status s);
// ---------------- Public Consts
@@ -1318,7 +1314,7 @@ typedef struct {
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
wuffs_adler32__status status;
wuffs_base__status status;
uint32_t magic;
uint32_t f_state;
@@ -1366,8 +1362,6 @@ extern "C" {
// ---------------- Status Codes
typedef int32_t wuffs_deflate__status;
#define wuffs_deflate__packageid 848533 // 0x000CF295
#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000
@@ -1418,9 +1412,7 @@ typedef int32_t wuffs_deflate__status;
#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \
-1123224939 // 0xBD0CF295
bool wuffs_deflate__status__is_error(wuffs_deflate__status s);
const char* wuffs_deflate__status__string(wuffs_deflate__status s);
const char* wuffs_deflate__status__string(wuffs_base__status s);
// ---------------- Public Consts
@@ -1435,7 +1427,7 @@ typedef struct {
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
wuffs_deflate__status status;
wuffs_base__status status;
uint32_t magic;
uint32_t f_bits;
@@ -1449,7 +1441,7 @@ typedef struct {
struct {
uint32_t coro_susp_point;
wuffs_deflate__status v_z;
wuffs_base__status v_z;
uint64_t v_n_copied;
uint32_t v_already_full;
} c_decode[1];
@@ -1515,10 +1507,9 @@ void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
// ---------------- Public Function Prototypes
wuffs_deflate__status wuffs_deflate__decoder__decode(
wuffs_deflate__decoder* self,
wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src);
wuffs_base__status wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self,
wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src);
#ifdef __cplusplus
} // extern "C"
@@ -1534,8 +1525,6 @@ extern "C" {
// ---------------- Status Codes
typedef int32_t wuffs_zlib__status;
#define wuffs_zlib__packageid 2064249 // 0x001F7F79
#define WUFFS_ZLIB__STATUS_OK 0 // 0x00000000
@@ -1563,9 +1552,7 @@ typedef int32_t wuffs_zlib__status;
#define WUFFS_ZLIB__ERROR_TODO_UNSUPPORTED_PRESET_DICTIONARY \
-1071677575 // 0xC01F7F79
bool wuffs_zlib__status__is_error(wuffs_zlib__status s);
const char* wuffs_zlib__status__string(wuffs_zlib__status s);
const char* wuffs_zlib__status__string(wuffs_base__status s);
// ---------------- Public Consts
@@ -1580,7 +1567,7 @@ typedef struct {
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
wuffs_zlib__status status;
wuffs_base__status status;
uint32_t magic;
wuffs_deflate__decoder f_flate;
@@ -1591,7 +1578,7 @@ typedef struct {
uint32_t coro_susp_point;
uint16_t v_x;
uint32_t v_checksum_got;
wuffs_zlib__status v_z;
wuffs_base__status v_z;
uint32_t v_checksum_want;
uint64_t scratch;
} c_decode[1];
@@ -1614,7 +1601,7 @@ void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
void wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self,
bool a_ic);
wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
wuffs_base__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src);
@@ -2178,10 +2165,6 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark(
// ---------------- Status Codes Implementations
bool wuffs_zlib__status__is_error(wuffs_zlib__status s) {
return s < 0;
}
static const char wuffs_zlib__status__string_data[] = {
0x00, 0x7A, 0x6C, 0x69, 0x62, 0x3A, 0x20, 0x54, 0x4F, 0x44, 0x4F, 0x3A,
0x20, 0x75, 0x6E, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64,
@@ -2230,7 +2213,7 @@ static const uint16_t wuffs_zlib__status__string_offsets[] = {
0x002B, 0x0042, 0x0064, 0x0081,
};
const char* wuffs_zlib__status__string(wuffs_zlib__status s) {
const char* wuffs_zlib__status__string(wuffs_base__status s) {
uint16_t o;
switch (s & 0x1FFFFF) {
case 0:
@@ -2308,7 +2291,7 @@ void wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self,
// -------- func decoder.decode
wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
wuffs_base__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src) {
if (!self) {
@@ -2321,11 +2304,11 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
if (self->private_impl.status < 0) {
return self->private_impl.status;
}
wuffs_zlib__status status = WUFFS_ZLIB__STATUS_OK;
wuffs_base__status status = WUFFS_BASE__STATUS_OK;
uint16_t v_x;
uint32_t v_checksum_got;
wuffs_zlib__status v_z;
wuffs_base__status v_z;
uint32_t v_checksum_want;
uint8_t* ioptr_dst = NULL;
@@ -2427,7 +2410,7 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
if (a_src.private_impl.buf) {
a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr;
}
wuffs_zlib__status t_2 = wuffs_deflate__decoder__decode(
wuffs_base__status t_2 = wuffs_deflate__decoder__decode(
&self->private_impl.f_flate, a_dst, a_src);
if (a_dst.private_impl.buf) {
ioptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi;