base: rename history_retain_length

It was renamed to dst_history_retain_length.

It also was removed from image_decoders and token_decoders. It only
applies to io_transformers, as retaining history applies to the
destination (not source) IO buffer.

Also adjust example/bzcat and example/zcat to apply the history retain
length to the dst (not src) buffer.
This commit is contained in:
Nigel Tao committed 2023-12-17 12:26:08 +11:00
1 parent b4e09690a7
commit eed1af7bee
34 files changed
+179 -640

No files matched your search

+12 -10
View File
@@ -191,12 +191,20 @@ main1(int argc, char** argv) {
wuffs_base__make_slice_u8(g_work_buffer_array,
WORK_BUFFER_ARRAY_SIZE));
if (dst.meta.wi) {
if (dst.meta.ri < dst.meta.wi) {
// TODO: handle EINTR and other write errors; see "man 2 write".
const int stdout_fd = 1;
ignore_return_value(write(stdout_fd, g_dst_buffer_array, dst.meta.wi));
ignore_return_value(write(stdout_fd, g_dst_buffer_array + dst.meta.ri,
dst.meta.wi - dst.meta.ri));
dst.meta.ri = dst.meta.wi;
wuffs_base__io_buffer__compact(&dst);
wuffs_base__optional_u63 hrl =
wuffs_bzip2__decoder__dst_history_retain_length(&dec);
wuffs_base__io_buffer__compact_retaining(
&dst, wuffs_base__optional_u63__value_or(&hrl, UINT64_MAX));
if (dst.meta.wi == dst.data.len) {
return "main: unsupported history length (a.k.a. dictionary size)";
}
}
if (status.repr == wuffs_base__suspension__short_read) {
@@ -208,13 +216,7 @@ 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_base__optional_u63__value_or(&hrl, UINT64_MAX));
if (src.meta.wi == src.data.len) {
return "main: internal error: no I/O progress possible";
}
wuffs_base__io_buffer__compact(&src);
}
}
+7 -13
View File
@@ -251,14 +251,11 @@ static void //
ignore_return_value(int ignored) {}
const char* //
read_more_src(wuffs_base__optional_u63 history_retain_length) {
read_more_src() {
if (g_src.meta.closed) {
return "main: unexpected end of file";
}
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));
}
wuffs_base__io_buffer__compact(&g_src);
if (g_src.meta.wi == g_src.data.len) {
return "main: internal error: no I/O progress possible";
}
@@ -287,7 +284,7 @@ load_image_type() {
(wuffs_base__io_buffer__reader_length(&g_src) == g_src.data.len)) {
break;
}
TRY(read_more_src(wuffs_base__make_optional_u63(true, 0)));
TRY(read_more_src());
}
return NULL;
}
@@ -412,7 +409,7 @@ advance_for_redirect() {
break;
}
g_src.meta.ri = g_src.meta.wi;
TRY(read_more_src(wuffs_base__make_optional_u63(true, 0)));
TRY(read_more_src());
}
return NULL;
}
@@ -439,8 +436,7 @@ redirect:
} else if (status.repr != wuffs_base__suspension__short_read) {
return wuffs_base__status__message(&status);
}
TRY(read_more_src(
wuffs_base__image_decoder__history_retain_length(g_image_decoder)));
TRY(read_more_src());
}
// Read the dimensions.
@@ -639,8 +635,7 @@ convert_frames() {
} else if (dfc_status.repr != wuffs_base__suspension__short_read) {
return wuffs_base__status__message(&dfc_status);
}
TRY(read_more_src(
wuffs_base__image_decoder__history_retain_length(g_image_decoder)));
TRY(read_more_src());
}
wuffs_base__flicks duration =
@@ -682,8 +677,7 @@ convert_frames() {
if (df_status.repr != wuffs_base__suspension__short_read) {
break;
}
decode_frame_io_error_message = read_more_src(
wuffs_base__image_decoder__history_retain_length(g_image_decoder));
decode_frame_io_error_message = read_more_src();
if (decode_frame_io_error_message != NULL) {
// Neuter the "short read" df_status so that convert_frames returns the
// I/O error message instead.
+4 -4
View File
@@ -997,11 +997,11 @@ static void //
ignore_return_value(int ignored) {}
const char* //
read_src(uint64_t history_retain_length) {
read_src() {
if (g_src.meta.closed) {
return "main: internal error: read requested on a closed source";
}
g_src.compact_retaining(history_retain_length);
g_src.compact();
if (g_src.meta.wi >= g_src.data.len) {
return "main: g_src buffer is full";
}
@@ -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().value_or(UINT64_MAX)));
TRY(read_src());
}
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().value_or(UINT64_MAX)));
TRY(read_src());
g_cursor_index = g_src.meta.ri;
} else if (status.repr == wuffs_base__suspension__short_write) {
g_tok.compact();
+2 -2
View File
@@ -189,7 +189,7 @@ class Wuffs_Load_RW_Input : public wuffs_aux::sync_io::Input {
private:
std::string //
CopyIn(wuffs_aux::IOBuffer* dst, uint64_t history_retain_length) override {
CopyIn(wuffs_aux::IOBuffer* dst) override {
if (!m_rw) {
return "Wuffs_Load_RW_Input: NULL SDL_RWops";
} else if (!dst) {
@@ -197,7 +197,7 @@ class Wuffs_Load_RW_Input : public wuffs_aux::sync_io::Input {
} else if (dst->meta.closed) {
return "Wuffs_Load_RW_Input: end of file";
}
dst->compact_retaining(history_retain_length);
dst->compact();
if (dst->writer_length() == 0) {
return "Wuffs_Load_RW_Input: full IOBuffer";
}
+12 -10
View File
@@ -193,12 +193,20 @@ main1(int argc, char** argv) {
wuffs_base__make_slice_u8(g_work_buffer_array,
WORK_BUFFER_ARRAY_SIZE));
if (dst.meta.wi) {
if (dst.meta.ri < dst.meta.wi) {
// TODO: handle EINTR and other write errors; see "man 2 write".
const int stdout_fd = 1;
ignore_return_value(write(stdout_fd, g_dst_buffer_array, dst.meta.wi));
ignore_return_value(write(stdout_fd, g_dst_buffer_array + dst.meta.ri,
dst.meta.wi - dst.meta.ri));
dst.meta.ri = dst.meta.wi;
wuffs_base__io_buffer__compact(&dst);
wuffs_base__optional_u63 hrl =
wuffs_gzip__decoder__dst_history_retain_length(&dec);
wuffs_base__io_buffer__compact_retaining(
&dst, wuffs_base__optional_u63__value_or(&hrl, UINT64_MAX));
if (dst.meta.wi == dst.data.len) {
return "main: unsupported history length (a.k.a. dictionary size)";
}
}
if (status.repr == wuffs_base__suspension__short_read) {
@@ -210,13 +218,7 @@ 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_base__optional_u63__value_or(&hrl, UINT64_MAX));
if (src.meta.wi == src.data.len) {
return "main: internal error: no I/O progress possible";
}
wuffs_base__io_buffer__compact(&src);
}
}