base: add optional_u63 type

This commit is contained in:
Nigel Tao committed 2023-11-19 12:02:24 +11:00
1 parent e517ca4bee
commit 82ea1985b4
32 files changed
+470 -295

No files matched your search

+3 -1
View File
@@ -208,8 +208,10 @@ main1(int argc, char** argv) {
return wuffs_base__status__message(&status);
}
wuffs_base__optional_u63 hrl =
wuffs_bzip2__decoder__history_retain_length(&dec);
wuffs_base__io_buffer__compact_retaining(
&src, wuffs_bzip2__decoder__history_retain_length(&dec));
&src, wuffs_base__optional_u63__value_or(&hrl, UINT64_MAX));
if (src.meta.wi == src.data.len) {
return "main: internal error: no I/O progress possible";
}
+10 -4
View File
@@ -251,11 +251,17 @@ static void //
ignore_return_value(int ignored) {}
const char* //
read_more_src(uint64_t history_retain_length) {
read_more_src(wuffs_base__optional_u63 history_retain_length) {
if (g_src.meta.closed) {
return "main: unexpected end of file";
}
wuffs_base__io_buffer__compact_retaining(&g_src, history_retain_length);
if (wuffs_base__optional_u63__has_value(&history_retain_length)) {
wuffs_base__io_buffer__compact_retaining(
&g_src, wuffs_base__optional_u63__value(&history_retain_length));
}
if (g_src.meta.wi == g_src.data.len) {
return "main: internal error: no I/O progress possible";
}
ssize_t n = read(STDIN_FD, g_src.data.ptr + g_src.meta.wi,
g_src.data.len - g_src.meta.wi);
if (n > 0) {
@@ -281,7 +287,7 @@ load_image_type() {
(wuffs_base__io_buffer__reader_length(&g_src) == g_src.data.len)) {
break;
}
TRY(read_more_src(0));
TRY(read_more_src(wuffs_base__make_optional_u63(true, 0)));
}
return NULL;
}
@@ -406,7 +412,7 @@ advance_for_redirect() {
break;
}
g_src.meta.ri = g_src.meta.wi;
TRY(read_more_src(0));
TRY(read_more_src(wuffs_base__make_optional_u63(true, 0)));
}
return NULL;
}
+2 -2
View File
@@ -1394,7 +1394,7 @@ main1(int argc, char** argv) {
}
// Check that we've exhausted the input.
if ((g_src.meta.ri == g_src.meta.wi) && !g_src.meta.closed) {
TRY(read_src(g_dec.history_retain_length()));
TRY(read_src(g_dec.history_retain_length().value_or(UINT64_MAX)));
}
if ((g_src.meta.ri < g_src.meta.wi) || !g_src.meta.closed) {
return "main: valid JSON followed by further (unexpected) data";
@@ -1405,7 +1405,7 @@ main1(int argc, char** argv) {
if (g_cursor_index != g_src.meta.ri) {
return "main: internal error: inconsistent g_src indexes";
}
TRY(read_src(g_dec.history_retain_length()));
TRY(read_src(g_dec.history_retain_length().value_or(UINT64_MAX)));
g_cursor_index = g_src.meta.ri;
} else if (status.repr == wuffs_base__suspension__short_write) {
g_tok.compact();
+3 -1
View File
@@ -210,8 +210,10 @@ main1(int argc, char** argv) {
return wuffs_base__status__message(&status);
}
wuffs_base__optional_u63 hrl =
wuffs_gzip__decoder__history_retain_length(&dec);
wuffs_base__io_buffer__compact_retaining(
&src, wuffs_gzip__decoder__history_retain_length(&dec));
&src, wuffs_base__optional_u63__value_or(&hrl, UINT64_MAX));
if (src.meta.wi == src.data.len) {
return "main: internal error: no I/O progress possible";
}