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:
Nigel Tao committed 2018-05-29 21:59:50 +10:00
1 parent 1211e16e3c
commit 5b08ad2ba6
24 files changed
+184 -173

No files matched your search

+31 -20
View File
@@ -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);