From de5b64a84639e5e0f83b6ec3fc737e4463805c11 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 2 Feb 2019 16:29:54 +1100 Subject: [PATCH] Rename max_incl_workbuf_len constants --- example/library/library.c | 2 +- example/zcat/zcat.c | 2 +- fuzz/c/std/zlib_fuzzer.c | 2 +- release/c/wuffs-unsupported-snapshot.c | 30 +++++++++++++------------- std/deflate/decode_deflate.wuffs | 2 +- std/gif/decode_gif.wuffs | 4 ++-- std/gzip/decode_gzip.wuffs | 4 ++-- std/lzw/decode_lzw.wuffs | 2 +- std/zlib/decode_zlib.wuffs | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/example/library/library.c b/example/library/library.c index 8586683c..61c647bf 100644 --- a/example/library/library.c +++ b/example/library/library.c @@ -53,7 +53,7 @@ uint8_t lgtm_ptr[] = { }; size_t lgtm_len = 20; -#define WORK_BUFFER_SIZE WUFFS_DEFLATE__MAX_INCL_WORKBUF_LEN +#define WORK_BUFFER_SIZE WUFFS_DEFLATE__DECODER_WORKBUF_LEN_MAX_INCL uint8_t work_buffer[WORK_BUFFER_SIZE]; // ignore_return_value suppresses errors from -Wall -Werror. diff --git a/example/zcat/zcat.c b/example/zcat/zcat.c index 77376e5e..8706072d 100644 --- a/example/zcat/zcat.c +++ b/example/zcat/zcat.c @@ -69,7 +69,7 @@ for a C compiler $CC, such as clang or gcc. #define SRC_BUFFER_SIZE (128 * 1024) #endif -#define WORK_BUFFER_SIZE WUFFS_GZIP__MAX_INCL_WORKBUF_LEN +#define WORK_BUFFER_SIZE WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL uint8_t dst_buffer[DST_BUFFER_SIZE]; uint8_t src_buffer[SRC_BUFFER_SIZE]; diff --git a/fuzz/c/std/zlib_fuzzer.c b/fuzz/c/std/zlib_fuzzer.c index f5a4ba23..dc04971a 100644 --- a/fuzz/c/std/zlib_fuzzer.c +++ b/fuzz/c/std/zlib_fuzzer.c @@ -48,7 +48,7 @@ It should print "PASS", amongst other information, and exit(0). #include "../../../release/c/wuffs-unsupported-snapshot.c" #include "../fuzzlib/fuzzlib.c" -#define WORK_BUFFER_SIZE WUFFS_ZLIB__MAX_INCL_WORKBUF_LEN +#define WORK_BUFFER_SIZE WUFFS_ZLIB__DECODER_WORKBUF_LEN_MAX_INCL uint8_t work_buffer[WORK_BUFFER_SIZE]; const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 8bf14de6..8c3a25a1 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2647,10 +2647,10 @@ extern const char* wuffs_deflate__error__no_huffman_codes; // ---------------- Public Consts -#define WUFFS_DEFLATE__MAX_INCL_WORKBUF_LEN 33280 +#define WUFFS_DEFLATE__DECODER_WORKBUF_LEN_MAX_INCL 33280 -static const uint64_t // - wuffs_deflate__max_incl_workbuf_len // +static const uint64_t // + wuffs_deflate__decoder_workbuf_len_max_incl // WUFFS_BASE__POTENTIALLY_UNUSED = 33280; // ---------------- Struct Declarations @@ -2820,10 +2820,10 @@ extern const char* wuffs_lzw__error__bad_code; // ---------------- Public Consts -#define WUFFS_LZW__MAX_INCL_WORKBUF_LEN 0 +#define WUFFS_LZW__DECODER_WORKBUF_LEN_MAX_INCL 0 -static const uint64_t // - wuffs_lzw__max_incl_workbuf_len // +static const uint64_t // + wuffs_lzw__decoder_workbuf_len_max_incl // WUFFS_BASE__POTENTIALLY_UNUSED = 0; // ---------------- Struct Declarations @@ -2986,10 +2986,10 @@ extern const char* wuffs_gif__error__too_much_pixel_data; // ---------------- Public Consts -#define WUFFS_GIF__MAX_INCL_WORKBUF_LEN 65535 +#define WUFFS_GIF__DECODER_WORKBUF_LEN_MAX_INCL 65535 -static const uint64_t // - wuffs_gif__max_incl_workbuf_len // +static const uint64_t // + wuffs_gif__decoder_workbuf_len_max_incl // WUFFS_BASE__POTENTIALLY_UNUSED = 65535; // ---------------- Struct Declarations @@ -3282,10 +3282,10 @@ extern const char* wuffs_gzip__error__bad_header; // ---------------- Public Consts -#define WUFFS_GZIP__MAX_INCL_WORKBUF_LEN 33280 +#define WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL 33280 -static const uint64_t // - wuffs_gzip__max_incl_workbuf_len // +static const uint64_t // + wuffs_gzip__decoder_workbuf_len_max_incl // WUFFS_BASE__POTENTIALLY_UNUSED = 33280; // ---------------- Struct Declarations @@ -3426,10 +3426,10 @@ extern const char* wuffs_zlib__error__bad_parity_check; // ---------------- Public Consts -#define WUFFS_ZLIB__MAX_INCL_WORKBUF_LEN 33280 +#define WUFFS_ZLIB__DECODER_WORKBUF_LEN_MAX_INCL 33280 -static const uint64_t // - wuffs_zlib__max_incl_workbuf_len // +static const uint64_t // + wuffs_zlib__decoder_workbuf_len_max_incl // WUFFS_BASE__POTENTIALLY_UNUSED = 33280; // ---------------- Struct Declarations diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 0c16acd7..18c56fbc 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -31,7 +31,7 @@ pri status "?internal error: inconsistent I/O" pri status "?internal error: inconsistent distance" pri status "?internal error: inconsistent n_bits" -pub const max_incl_workbuf_len base.u64 = 32768 + 512 +pub const decoder_workbuf_len_max_incl base.u64 = 32768 + 512 // The next two tables were created by script/print-deflate-magic-numbers.go. // diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index bb2e4ad5..b0e4327d 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -24,8 +24,8 @@ pub status "?too much pixel data" pri status "?internal error: inconsistent ri/wi" -// TODO: reference lzw.max_incl_workbuf_len. -pub const max_incl_workbuf_len base.u64 = 0xFFFF +// TODO: reference lzw.decoder_workbuf_len_max_incl. +pub const decoder_workbuf_len_max_incl base.u64 = 0xFFFF // See the spec appendix E "Interlaced Images" on page 29. The first element // represents either that the frame was non-interlaced, or that all interlace diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index e839ae0f..296f6d8d 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -20,8 +20,8 @@ pub status "?bad compression method" pub status "?bad encoding flags" pub status "?bad header" -// TODO: reference deflate.max_incl_workbuf_len. -pub const max_incl_workbuf_len base.u64 = 32768 + 512 +// TODO: reference deflate.decoder_workbuf_len_max_incl. +pub const decoder_workbuf_len_max_incl base.u64 = 32768 + 512 pub struct decoder?( flate deflate.decoder, diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index 17ef800f..5a46871c 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -18,7 +18,7 @@ pri status "?internal error: inconsistent I/O" // TODO: move bulk data buffers like decoder.suffixes or decoder.output into // the workbuf? -pub const max_incl_workbuf_len base.u64 = 0 +pub const decoder_workbuf_len_max_incl base.u64 = 0 pub struct decoder?( // The value passed to set_literal_width. This lw field is copied to the diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index 819f2723..ff42ad00 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -22,8 +22,8 @@ pub status "?bad parity check" pri status "?TODO: unsupported preset dictionary" -// TODO: reference deflate.max_incl_workbuf_len. -pub const max_incl_workbuf_len base.u64 = 32768 + 512 +// TODO: reference deflate.decoder_workbuf_len_max_incl. +pub const decoder_workbuf_len_max_incl base.u64 = 32768 + 512 pub struct decoder?( flate deflate.decoder,