mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Have check_wuffs_version return a status code
This commit is contained in:
1 parent
845ffbeb86
commit
fd43e777bc
21 files changed
+628
-466
No files matched your search
@@ -57,7 +57,11 @@ uint8_t src_buffer[SRC_BUFFER_SIZE];
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
wuffs_crc32__ieee_hasher h = ((wuffs_crc32__ieee_hasher){});
|
||||
h.check_wuffs_version(sizeof h, WUFFS_VERSION);
|
||||
wuffs_base__status z = h.check_wuffs_version(sizeof h, WUFFS_VERSION);
|
||||
if (z) {
|
||||
fprintf(stderr, "%s\n", wuffs_crc32__status__string(z));
|
||||
return 1;
|
||||
}
|
||||
|
||||
while (true) {
|
||||
const int stdin_fd = 0;
|
||||
|
||||
@@ -271,7 +271,11 @@ const char* allocate(wuffs_base__pixel_config* pc) {
|
||||
|
||||
const char* play() {
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__status z =
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
if (z) {
|
||||
return wuffs_gif__status__string(z);
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
|
||||
.ptr = src_buffer, .len = src_len, .wi = src_len, .closed = true});
|
||||
@@ -280,10 +284,9 @@ const char* play() {
|
||||
if (first_play) {
|
||||
first_play = false;
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__status s =
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (s) {
|
||||
return wuffs_gif__status__string(s);
|
||||
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (z) {
|
||||
return wuffs_gif__status__string(z);
|
||||
}
|
||||
if (!wuffs_base__image_config__is_valid(&ic)) {
|
||||
return "invalid image configuration";
|
||||
@@ -297,11 +300,11 @@ const char* play() {
|
||||
if (msg) {
|
||||
return msg;
|
||||
}
|
||||
s = wuffs_base__pixel_buffer__set_from_slice(
|
||||
z = wuffs_base__pixel_buffer__set_from_slice(
|
||||
&pb, wuffs_base__image_config__pixel_config(&ic),
|
||||
((wuffs_base__slice_u8){.ptr = image_buffer, .len = image_len}));
|
||||
if (s) {
|
||||
return wuffs_gif__status__string(s);
|
||||
if (z) {
|
||||
return wuffs_gif__status__string(z);
|
||||
}
|
||||
memset(image_buffer, 0, image_len);
|
||||
memset(dst_buffer, 0, dst_len);
|
||||
@@ -310,13 +313,13 @@ const char* play() {
|
||||
|
||||
while (1) {
|
||||
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
|
||||
wuffs_base__status s =
|
||||
wuffs_base__status z =
|
||||
wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
|
||||
if (s) {
|
||||
if (s == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
if (z) {
|
||||
if (z == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
break;
|
||||
}
|
||||
return wuffs_gif__status__string(s);
|
||||
return wuffs_gif__status__string(z);
|
||||
}
|
||||
|
||||
switch (wuffs_base__frame_config__disposal(&fc)) {
|
||||
@@ -326,13 +329,13 @@ const char* play() {
|
||||
}
|
||||
}
|
||||
|
||||
s = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
|
||||
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
|
||||
((wuffs_base__slice_u8){}));
|
||||
if (s) {
|
||||
if (s == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
if (z) {
|
||||
if (z == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
break;
|
||||
}
|
||||
return wuffs_gif__status__string(s);
|
||||
return wuffs_gif__status__string(z);
|
||||
}
|
||||
|
||||
compose(&pb, wuffs_base__frame_config__bounds(&fc));
|
||||
|
||||
@@ -60,11 +60,14 @@ static const char* decode() {
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__status s =
|
||||
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (s) {
|
||||
return wuffs_deflate__status__string(s);
|
||||
wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version(
|
||||
&dec, sizeof dec, WUFFS_VERSION);
|
||||
if (z) {
|
||||
return wuffs_deflate__status__string(z);
|
||||
}
|
||||
z = wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (z) {
|
||||
return wuffs_deflate__status__string(z);
|
||||
}
|
||||
ignore_return_value(write(1, dst.ptr, dst.wi));
|
||||
return NULL;
|
||||
|
||||
+10
-6
@@ -75,7 +75,11 @@ static void ignore_return_value(int ignored) {}
|
||||
|
||||
static const char* decode() {
|
||||
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__status z =
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
if (z) {
|
||||
return wuffs_gzip__status__string(z);
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = src_buffer, .len = SRC_BUFFER_SIZE});
|
||||
@@ -98,7 +102,7 @@ static const char* decode() {
|
||||
wuffs_base__io_buffer dst =
|
||||
((wuffs_base__io_buffer){.ptr = dst_buffer, .len = DST_BUFFER_SIZE});
|
||||
|
||||
wuffs_base__status s =
|
||||
wuffs_base__status z =
|
||||
wuffs_gzip__decoder__decode(&dec, wuffs_base__io_buffer__writer(&dst),
|
||||
wuffs_base__io_buffer__reader(&src));
|
||||
|
||||
@@ -108,16 +112,16 @@ static const char* decode() {
|
||||
ignore_return_value(write(stdout_fd, dst_buffer, dst.wi));
|
||||
}
|
||||
|
||||
if (s == WUFFS_BASE__STATUS_OK) {
|
||||
if (z == WUFFS_BASE__STATUS_OK) {
|
||||
return NULL;
|
||||
}
|
||||
if (s == WUFFS_BASE__SUSPENSION_SHORT_READ) {
|
||||
if (z == WUFFS_BASE__SUSPENSION_SHORT_READ) {
|
||||
break;
|
||||
}
|
||||
if (s == WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
if (z == WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
continue;
|
||||
}
|
||||
return wuffs_gzip__status__string(s);
|
||||
return wuffs_gzip__status__string(z);
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer__compact(&src);
|
||||
|
||||
Reference in new issue
Block a user