Make wuffs_base__status a struct

This commit is contained in:
Nigel Tao committed 2020-01-05 10:48:20 +11:00
1 parent c50f16e58b
commit e6db7f6a40
24 files changed
+677 -499

No files matched your search

+2 -2
View File
@@ -59,8 +59,8 @@ uint8_t src_buffer[SRC_BUFFER_SIZE];
int main(int argc, char** argv) {
wuffs_crc32__ieee_hasher h;
wuffs_base__status status = h.initialize(sizeof h, WUFFS_VERSION, 0);
if (status) {
fprintf(stderr, "%s\n", wuffs_base__status__message(status));
if (!status.is_ok()) {
fprintf(stderr, "%s\n", status.message());
return 1;
}
+12 -12
View File
@@ -294,8 +294,8 @@ const char* play() {
wuffs_gif__decoder dec;
wuffs_base__status status =
wuffs_gif__decoder__initialize(&dec, sizeof dec, WUFFS_VERSION, 0);
if (status) {
return wuffs_base__status__message(status);
if (!wuffs_base__status__is_ok(&status)) {
return wuffs_base__status__message(&status);
}
if (quirk_honor_background_color_flag) {
@@ -314,8 +314,8 @@ const char* play() {
if (first_play) {
wuffs_base__image_config ic = {0};
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
return wuffs_base__status__message(status);
if (!wuffs_base__status__is_ok(&status)) {
return wuffs_base__status__message(&status);
}
if (!wuffs_base__image_config__is_valid(&ic)) {
return "invalid image configuration";
@@ -336,8 +336,8 @@ const char* play() {
return msg;
}
status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, pixbuf);
if (status) {
return wuffs_base__status__message(status);
if (!wuffs_base__status__is_ok(&status)) {
return wuffs_base__status__message(&status);
}
memset(pixbuf.ptr, 0, pixbuf.len);
}
@@ -346,11 +346,11 @@ const char* play() {
wuffs_base__frame_config fc = {0};
wuffs_base__status status =
wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (status) {
if (status == wuffs_base__warning__end_of_data) {
if (!wuffs_base__status__is_ok(&status)) {
if (status.repr == wuffs_base__warning__end_of_data) {
break;
}
return wuffs_base__status__message(status);
return wuffs_base__status__message(&status);
}
if (wuffs_base__frame_config__index(&fc) == 0) {
@@ -372,7 +372,7 @@ const char* play() {
wuffs_base__status decode_frame_status =
wuffs_gif__decoder__decode_frame(&dec, &pb, &src, workbuf, NULL);
if (decode_frame_status == wuffs_base__warning__end_of_data) {
if (decode_frame_status.repr == wuffs_base__warning__end_of_data) {
break;
}
@@ -422,8 +422,8 @@ const char* play() {
// TODO: should a zero duration mean to show this frame forever?
if (decode_frame_status) {
return wuffs_base__status__message(decode_frame_status);
if (!wuffs_base__status__is_ok(&decode_frame_status)) {
return wuffs_base__status__message(&decode_frame_status);
}
}
+4 -4
View File
@@ -101,16 +101,16 @@ static const char* decode() {
wuffs_base__status status = wuffs_gzip__decoder__initialize(
dec, sizeof__wuffs_gzip__decoder(), WUFFS_VERSION,
WUFFS_INITIALIZE__ALREADY_ZEROED);
if (status) {
if (!wuffs_base__status__is_ok(&status)) {
free(dec);
return wuffs_base__status__message(status);
return wuffs_base__status__message(&status);
}
status = wuffs_gzip__decoder__decode_io_writer(
dec, &dst, &src,
wuffs_base__make_slice_u8(work_buffer, WORK_BUFFER_SIZE));
if (status) {
if (!wuffs_base__status__is_ok(&status)) {
free(dec);
return wuffs_base__status__message(status);
return wuffs_base__status__message(&status);
}
fwrite(dst.data.ptr, sizeof(uint8_t), dst.meta.wi, stdout);
free(dec);
+5 -5
View File
@@ -87,8 +87,8 @@ static const char* decode() {
wuffs_gzip__decoder dec;
wuffs_base__status status =
wuffs_gzip__decoder__initialize(&dec, sizeof dec, WUFFS_VERSION, 0);
if (status) {
return wuffs_base__status__message(status);
if (!wuffs_base__status__is_ok(&status)) {
return wuffs_base__status__message(&status);
}
wuffs_base__io_buffer dst;
@@ -135,13 +135,13 @@ static const char* decode() {
wuffs_base__io_buffer__compact(&dst);
}
if (status == wuffs_base__suspension__short_read) {
if (status.repr == wuffs_base__suspension__short_read) {
break;
}
if (status == wuffs_base__suspension__short_write) {
if (status.repr == wuffs_base__suspension__short_write) {
continue;
}
return wuffs_base__status__message(status);
return wuffs_base__status__message(&status);
}
wuffs_base__io_buffer__compact(&src);