mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 08:32:11 +01:00
Change the order of check_wuffs_version args
This puts the self_ptr, self_len args next to each other.
This commit is contained in:
1 parent
1211e16e3c
commit
5b08ad2ba6
24 files changed
+184
-173
No files matched your search
@@ -107,8 +107,8 @@ void test_wuffs_adler32_golden() {
|
||||
int j;
|
||||
for (j = 0; j < 2; j++) {
|
||||
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum,
|
||||
WUFFS_VERSION);
|
||||
|
||||
uint32_t got = 0;
|
||||
size_t num_fragments = 0;
|
||||
@@ -167,8 +167,8 @@ void test_wuffs_adler32_pi() {
|
||||
int i;
|
||||
for (i = 0; i < 64; i++) {
|
||||
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum,
|
||||
WUFFS_VERSION);
|
||||
uint32_t got =
|
||||
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = (uint8_t*)(digits),
|
||||
@@ -195,8 +195,8 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
|
||||
len = wuffs_base__u64__min(len, rlimit);
|
||||
}
|
||||
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum,
|
||||
WUFFS_VERSION);
|
||||
global_wuffs_adler32_unused_u32 =
|
||||
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = src->ptr + src->ri,
|
||||
|
||||
+6
-6
@@ -107,8 +107,8 @@ void test_wuffs_crc32_ieee_golden() {
|
||||
int j;
|
||||
for (j = 0; j < 2; j++) {
|
||||
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum,
|
||||
WUFFS_VERSION);
|
||||
|
||||
uint32_t got = 0;
|
||||
size_t num_fragments = 0;
|
||||
@@ -167,8 +167,8 @@ void test_wuffs_crc32_ieee_pi() {
|
||||
int i;
|
||||
for (i = 0; i < 64; i++) {
|
||||
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum,
|
||||
WUFFS_VERSION);
|
||||
uint32_t got = wuffs_crc32__ieee_hasher__update(
|
||||
&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = (uint8_t*)(digits),
|
||||
@@ -195,8 +195,8 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
|
||||
len = wuffs_base__u64__min(len, rlimit);
|
||||
}
|
||||
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum,
|
||||
WUFFS_VERSION);
|
||||
global_wuffs_crc32_unused_u32 =
|
||||
wuffs_crc32__ieee_hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = src->ptr + src->ri,
|
||||
|
||||
@@ -112,7 +112,7 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
if (wlimit) {
|
||||
@@ -220,8 +220,8 @@ void test_wuffs_deflate_decode_split_src() {
|
||||
got.wi = 0;
|
||||
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION,
|
||||
sizeof dec);
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec,
|
||||
WUFFS_VERSION);
|
||||
|
||||
src.closed = false;
|
||||
src.ri = gt->src_offset0;
|
||||
@@ -312,8 +312,8 @@ void test_wuffs_deflate_history_full() {
|
||||
int i;
|
||||
for (i = -2; i <= +2; i++) {
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION,
|
||||
sizeof dec);
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec,
|
||||
WUFFS_VERSION);
|
||||
|
||||
if (!do_test_wuffs_deflate_history(
|
||||
i, gt, &src, &got, &dec, 0, want.wi + i,
|
||||
@@ -379,8 +379,8 @@ void test_wuffs_deflate_history_partial() {
|
||||
const uint32_t fragment_length = 4;
|
||||
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION,
|
||||
sizeof dec);
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec,
|
||||
WUFFS_VERSION);
|
||||
|
||||
if (!do_test_wuffs_deflate_history(i, gt, &src, &got, &dec,
|
||||
starting_history_index, fragment_length,
|
||||
@@ -463,7 +463,7 @@ void test_wuffs_deflate_table_redirect() {
|
||||
// 2nd is the key in the second level table (variable bits).
|
||||
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
|
||||
int i;
|
||||
int n = 0;
|
||||
|
||||
+31
-20
@@ -54,18 +54,22 @@ void test_basic_bad_receiver() {
|
||||
wuffs_base__io_reader src = ((wuffs_base__io_reader){});
|
||||
wuffs_gif__status status = wuffs_gif__decoder__decode_config(NULL, &ic, src);
|
||||
if (status != WUFFS_GIF__ERROR_BAD_RECEIVER) {
|
||||
FAIL("decode_config: got %d, want %d", status,
|
||||
WUFFS_GIF__ERROR_BAD_RECEIVER);
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status), WUFFS_GIF__ERROR_BAD_RECEIVER,
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_RECEIVER));
|
||||
}
|
||||
}
|
||||
|
||||
void test_basic_bad_sizeof_receiver() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, 0, WUFFS_VERSION);
|
||||
if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER) {
|
||||
FAIL("decode_config: got %d, want %d", dec.private_impl.status,
|
||||
WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER);
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
dec.private_impl.status,
|
||||
wuffs_gif__status__string(dec.private_impl.status),
|
||||
WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER,
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -73,10 +77,14 @@ void test_basic_bad_sizeof_receiver() {
|
||||
void test_basic_bad_wuffs_version() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION ^ 0x12345678, 0);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec,
|
||||
WUFFS_VERSION ^ 0x12345678);
|
||||
if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_WUFFS_VERSION) {
|
||||
FAIL("decode_config: got %d, want %d", dec.private_impl.status,
|
||||
WUFFS_GIF__ERROR_BAD_WUFFS_VERSION);
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
|
||||
dec.private_impl.status,
|
||||
wuffs_gif__status__string(dec.private_impl.status),
|
||||
WUFFS_GIF__ERROR_BAD_WUFFS_VERSION,
|
||||
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_WUFFS_VERSION));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -88,8 +96,11 @@ void test_basic_check_wuffs_version_not_called() {
|
||||
wuffs_base__io_reader src = ((wuffs_base__io_reader){});
|
||||
wuffs_gif__status status = wuffs_gif__decoder__decode_config(&dec, &ic, src);
|
||||
if (status != WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED) {
|
||||
FAIL("decode_config: got %d, want %d", status,
|
||||
WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED);
|
||||
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
|
||||
wuffs_gif__status__string(status),
|
||||
WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED,
|
||||
wuffs_gif__status__string(
|
||||
WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,7 +163,7 @@ void test_basic_status_strings() {
|
||||
void test_basic_sub_struct_initializer() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
if (dec.private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
FAIL("outer magic: got %u, want %u", dec.private_impl.magic,
|
||||
WUFFS_BASE__MAGIC);
|
||||
@@ -204,7 +215,7 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
|
||||
}
|
||||
|
||||
wuffs_gif__lzw_decoder dec = ((wuffs_gif__lzw_decoder){});
|
||||
wuffs_gif__lzw_decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gif__lzw_decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_gif__lzw_decoder__set_literal_width(&dec, literal_width);
|
||||
int num_iters = 0;
|
||||
while (true) {
|
||||
@@ -331,8 +342,8 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters_unscaled) {
|
||||
dst.wi = 0;
|
||||
src.ri = 1; // Skip the literal width.
|
||||
wuffs_gif__lzw_decoder dec = ((wuffs_gif__lzw_decoder){});
|
||||
wuffs_gif__lzw_decoder__check_wuffs_version(&dec, WUFFS_VERSION,
|
||||
sizeof dec);
|
||||
wuffs_gif__lzw_decoder__check_wuffs_version(&dec, sizeof dec,
|
||||
WUFFS_VERSION);
|
||||
wuffs_gif__status s =
|
||||
wuffs_gif__lzw_decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (s) {
|
||||
@@ -360,7 +371,7 @@ void bench_wuffs_lzw_decode_100k() {
|
||||
const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer* src) {
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
|
||||
@@ -406,7 +417,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
{
|
||||
@@ -557,7 +568,7 @@ void test_wuffs_gif_call_sequence() {
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
@@ -585,7 +596,7 @@ bool do_test_wuffs_gif_decode_animated(
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
@@ -686,7 +697,7 @@ void test_wuffs_gif_decode_frame_out_of_bounds() {
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
wuffs_gif__status s =
|
||||
@@ -756,7 +767,7 @@ void test_wuffs_gif_decode_input_is_a_png() {
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
|
||||
+2
-2
@@ -67,7 +67,7 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
@@ -115,7 +115,7 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
|
||||
int end_limit;
|
||||
for (end_limit = 0; end_limit < 10; end_limit++) {
|
||||
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_gzip__decoder__set_ignore_checksum(&dec, ignore_checksum);
|
||||
got.wi = 0;
|
||||
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
|
||||
|
||||
+2
-2
@@ -82,7 +82,7 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
@@ -129,7 +129,7 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
|
||||
int end_limit;
|
||||
for (end_limit = 0; end_limit < 10; end_limit++) {
|
||||
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum);
|
||||
got.wi = 0;
|
||||
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
|
||||
|
||||
Reference in new issue
Block a user