Generate double '_'s for pkg__type__method names.

This commit is contained in:
Nigel Tao committed 2017-10-21 15:10:25 +11:00
1 parent 8ee56a7911
commit 6815375de5
13 files changed
+663 -660

No files matched your search

+65 -64
View File
@@ -157,13 +157,13 @@ void test_puffs_adler32() {
if (!read_file(&src, test_cases[i].filename)) {
return;
}
puffs_flate_adler32 checksum;
puffs_flate_adler32_initialize(&checksum, PUFFS_VERSION, 0);
puffs_flate__adler32 checksum;
puffs_flate__adler32__initialize(&checksum, PUFFS_VERSION, 0);
uint32_t got =
puffs_flate_adler32_update(&checksum, ((puffs_base_slice_u8){
.ptr = src.ptr + src.ri,
.len = src.wi - src.ri,
}));
puffs_flate__adler32__update(&checksum, ((puffs_base_slice_u8){
.ptr = src.ptr + src.ri,
.len = src.wi - src.ri,
}));
if (got != test_cases[i].want) {
FAIL("i=%d, filename=\"%s\": got 0x%08" PRIX32 ", want 0x%08" PRIX32 "\n",
i, test_cases[i].filename, got, test_cases[i].want);
@@ -178,8 +178,8 @@ const char* puffs_flate_decode(puffs_base_buf1* dst,
puffs_base_buf1* src,
uint64_t wlimit,
uint64_t rlimit) {
puffs_flate_flate_decoder dec;
puffs_flate_flate_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__flate_decoder dec;
puffs_flate__flate_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 dst_writer = {.buf = dst};
puffs_base_reader1 src_reader = {.buf = src};
while (true) {
@@ -192,17 +192,17 @@ const char* puffs_flate_decode(puffs_base_buf1* dst,
src_reader.limit.ptr_to_len = &rlim;
}
puffs_flate_status s =
puffs_flate_flate_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__status s =
puffs_flate__flate_decoder__decode(&dec, dst_writer, src_reader);
if (s == PUFFS_FLATE_STATUS_OK) {
if (s == PUFFS_FLATE__STATUS_OK) {
return NULL;
}
if ((wlimit && (s == PUFFS_FLATE_SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == PUFFS_FLATE_SUSPENSION_SHORT_READ))) {
if ((wlimit && (s == PUFFS_FLATE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == PUFFS_FLATE__SUSPENSION_SHORT_READ))) {
continue;
}
return puffs_flate_status_string(s);
return puffs_flate__status__string(s);
}
}
@@ -210,8 +210,8 @@ const char* puffs_zlib_decode(puffs_base_buf1* dst,
puffs_base_buf1* src,
uint64_t wlimit,
uint64_t rlimit) {
puffs_flate_zlib_decoder dec;
puffs_flate_zlib_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__zlib_decoder dec;
puffs_flate__zlib_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 dst_writer = {.buf = dst};
puffs_base_reader1 src_reader = {.buf = src};
@@ -225,17 +225,17 @@ const char* puffs_zlib_decode(puffs_base_buf1* dst,
src_reader.limit.ptr_to_len = &rlim;
}
puffs_flate_status s =
puffs_flate_zlib_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__status s =
puffs_flate__zlib_decoder__decode(&dec, dst_writer, src_reader);
if (s == PUFFS_FLATE_STATUS_OK) {
if (s == PUFFS_FLATE__STATUS_OK) {
return NULL;
}
if ((wlimit && (s == PUFFS_FLATE_SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == PUFFS_FLATE_SUSPENSION_SHORT_READ))) {
if ((wlimit && (s == PUFFS_FLATE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == PUFFS_FLATE__SUSPENSION_SHORT_READ))) {
continue;
}
return puffs_flate_status_string(s);
return puffs_flate__status__string(s);
}
}
@@ -294,7 +294,7 @@ void test_puffs_flate_decode_split_src() {
return;
}
puffs_flate_flate_decoder dec;
puffs_flate__flate_decoder dec;
puffs_base_writer1 dst_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
@@ -307,31 +307,31 @@ void test_puffs_flate_decode_split_src() {
}
got.wi = 0;
puffs_flate_flate_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__flate_decoder__initialize(&dec, PUFFS_VERSION, 0);
src.closed = false;
src.ri = gt->src_offset0;
src.wi = split;
puffs_flate_status s0 =
puffs_flate_flate_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__status s0 =
puffs_flate__flate_decoder__decode(&dec, dst_writer, src_reader);
src.closed = true;
src.ri = split;
src.wi = gt->src_offset1;
puffs_flate_status s1 =
puffs_flate_flate_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__status s1 =
puffs_flate__flate_decoder__decode(&dec, dst_writer, src_reader);
if (s0 != PUFFS_FLATE_SUSPENSION_SHORT_READ) {
if (s0 != PUFFS_FLATE__SUSPENSION_SHORT_READ) {
FAIL("i=%d: s0: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s0,
puffs_flate_status_string(s0), PUFFS_FLATE_SUSPENSION_SHORT_READ,
puffs_flate_status_string(PUFFS_FLATE_SUSPENSION_SHORT_READ));
puffs_flate__status__string(s0), PUFFS_FLATE__SUSPENSION_SHORT_READ,
puffs_flate__status__string(PUFFS_FLATE__SUSPENSION_SHORT_READ));
return;
}
if (s1 != PUFFS_FLATE_STATUS_OK) {
if (s1 != PUFFS_FLATE__STATUS_OK) {
FAIL("i=%d: s1: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s1,
puffs_flate_status_string(s1), PUFFS_FLATE_STATUS_OK,
puffs_flate_status_string(PUFFS_FLATE_STATUS_OK));
puffs_flate__status__string(s1), PUFFS_FLATE__STATUS_OK,
puffs_flate__status__string(PUFFS_FLATE__STATUS_OK));
return;
}
@@ -347,16 +347,16 @@ bool do_test_puffs_flate_history(int i,
golden_test* gt,
puffs_base_buf1* src,
puffs_base_buf1* got,
puffs_flate_flate_decoder* dec,
puffs_flate__flate_decoder* dec,
uint32_t starting_history_index,
uint64_t limit,
puffs_flate_status want_s) {
puffs_flate__status want_s) {
src->ri = gt->src_offset0;
src->wi = gt->src_offset1;
got->ri = 0;
got->wi = 0;
puffs_flate_flate_decoder_initialize(dec, PUFFS_VERSION, 0);
puffs_flate__flate_decoder__initialize(dec, PUFFS_VERSION, 0);
puffs_base_writer1 dst_writer = {.buf = got};
puffs_base_reader1 src_reader = {.buf = src};
@@ -364,13 +364,13 @@ bool do_test_puffs_flate_history(int i,
dst_writer.limit.ptr_to_len = &limit;
puffs_flate_status got_s =
puffs_flate_flate_decoder_decode(dec, dst_writer, src_reader);
puffs_flate__status got_s =
puffs_flate__flate_decoder__decode(dec, dst_writer, src_reader);
if (got_s != want_s) {
FAIL("i=%d: starting_history_index=0x%04" PRIX32
": decode status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
i, starting_history_index, got_s, puffs_flate_status_string(got_s),
want_s, puffs_flate_status_string(want_s));
i, starting_history_index, got_s, puffs_flate__status__string(got_s),
want_s, puffs_flate__status__string(want_s));
return false;
}
return true;
@@ -394,11 +394,11 @@ void test_puffs_flate_history_full() {
const int full_history_size = 0x8000;
int i;
for (i = -2; i <= +2; i++) {
puffs_flate_flate_decoder dec;
puffs_flate__flate_decoder dec;
if (!do_test_puffs_flate_history(
i, gt, &src, &got, &dec, 0, want.wi + i,
i >= 0 ? PUFFS_FLATE_STATUS_OK
: PUFFS_FLATE_SUSPENSION_SHORT_WRITE)) {
i >= 0 ? PUFFS_FLATE__STATUS_OK
: PUFFS_FLATE__SUSPENSION_SHORT_WRITE)) {
return;
}
@@ -456,10 +456,10 @@ void test_puffs_flate_history_partial() {
const char* fragment = "3.14";
const uint32_t fragment_length = 4;
puffs_flate_flate_decoder dec;
puffs_flate__flate_decoder dec;
if (!do_test_puffs_flate_history(i, gt, &src, &got, &dec,
starting_history_index, fragment_length,
PUFFS_FLATE_SUSPENSION_SHORT_WRITE)) {
PUFFS_FLATE__SUSPENSION_SHORT_WRITE)) {
return;
}
@@ -537,8 +537,8 @@ void test_puffs_flate_table_redirect() {
// 1st is the key in the first level table (9 bits).
// 2nd is the key in the second level table (variable bits).
puffs_flate_flate_decoder dec;
puffs_flate_flate_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__flate_decoder dec;
puffs_flate__flate_decoder__initialize(&dec, PUFFS_VERSION, 0);
// The initializer should zero out dec's fields, but to be paranoid, we zero
// it out explicitly.
@@ -561,10 +561,10 @@ void test_puffs_flate_table_redirect() {
dec.private_impl.f_code_lengths[n++] = 13;
dec.private_impl.f_code_lengths[n++] = 13;
puffs_flate_status s =
puffs_flate_flate_decoder_init_huff(&dec, 0, 0, n, 257);
puffs_flate__status s =
puffs_flate__flate_decoder__init_huff(&dec, 0, 0, n, 257);
if (s) {
FAIL("%s", puffs_flate_status_string(s));
FAIL("%s", puffs_flate__status__string(s));
return;
}
@@ -639,17 +639,18 @@ void test_puffs_zlib_checksum_mismatch() {
// Flip a bit in the zlib checksum, which comes at the end of the file.
src.ptr[src.wi - 1] ^= 1;
puffs_flate_zlib_decoder dec;
puffs_flate_zlib_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__zlib_decoder dec;
puffs_flate__zlib_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 got_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
puffs_flate_status status =
puffs_flate_zlib_decoder_decode(&dec, got_writer, src_reader);
if (status != PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH) {
puffs_flate__status status =
puffs_flate__zlib_decoder__decode(&dec, got_writer, src_reader);
if (status != PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
puffs_flate_status_string(status), PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH,
puffs_flate_status_string(PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH));
puffs_flate__status__string(status),
PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH,
puffs_flate__status__string(PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH));
return;
}
}
@@ -726,13 +727,13 @@ const char* puffs_bench_adler32(puffs_base_buf1* dst,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
puffs_flate_adler32 checksum;
puffs_flate_adler32_initialize(&checksum, PUFFS_VERSION, 0);
puffs_flate__adler32 checksum;
puffs_flate__adler32__initialize(&checksum, PUFFS_VERSION, 0);
global_puffs_flate_unused_u32 =
puffs_flate_adler32_update(&checksum, ((puffs_base_slice_u8){
.ptr = src->ptr + src->ri,
.len = src->wi - src->ri,
}));
puffs_flate__adler32__update(&checksum, ((puffs_base_slice_u8){
.ptr = src->ptr + src->ri,
.len = src->wi - src->ri,
}));
src->ri = src->wi;
return NULL;
}
+78 -76
View File
@@ -46,28 +46,28 @@ const char* proc_filename = "std/gif.c";
void test_basic_bad_argument_out_of_range() {
proc_funcname = __func__;
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
// Setting to 8 is in the [2..8] range.
puffs_gif_lzw_decoder_set_literal_width(&dec, 8);
if (dec.private_impl.status != PUFFS_GIF_STATUS_OK) {
puffs_gif__lzw_decoder__set_literal_width(&dec, 8);
if (dec.private_impl.status != PUFFS_GIF__STATUS_OK) {
FAIL("status: got %d, want %d", dec.private_impl.status,
PUFFS_GIF_STATUS_OK);
PUFFS_GIF__STATUS_OK);
}
// Setting to 999 is out of range.
puffs_gif_lzw_decoder_set_literal_width(&dec, 999);
if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_ARGUMENT) {
puffs_gif__lzw_decoder__set_literal_width(&dec, 999);
if (dec.private_impl.status != PUFFS_GIF__ERROR_BAD_ARGUMENT) {
FAIL("status: got %d, want %d", dec.private_impl.status,
PUFFS_GIF_ERROR_BAD_ARGUMENT);
PUFFS_GIF__ERROR_BAD_ARGUMENT);
}
// That error status code should be sticky.
puffs_gif_lzw_decoder_set_literal_width(&dec, 8);
if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_ARGUMENT) {
puffs_gif__lzw_decoder__set_literal_width(&dec, 8);
if (dec.private_impl.status != PUFFS_GIF__ERROR_BAD_ARGUMENT) {
FAIL("status: got %d, want %d", dec.private_impl.status,
PUFFS_GIF_ERROR_BAD_ARGUMENT);
PUFFS_GIF__ERROR_BAD_ARGUMENT);
}
}
@@ -75,39 +75,39 @@ void test_basic_bad_receiver() {
proc_funcname = __func__;
puffs_base_writer1 dst = {0};
puffs_base_reader1 src = {0};
puffs_gif_status status = puffs_gif_lzw_decoder_decode(NULL, dst, src);
if (status != PUFFS_GIF_ERROR_BAD_RECEIVER) {
FAIL("status: got %d, want %d", status, PUFFS_GIF_ERROR_BAD_RECEIVER);
puffs_gif__status status = puffs_gif__lzw_decoder__decode(NULL, dst, src);
if (status != PUFFS_GIF__ERROR_BAD_RECEIVER) {
FAIL("status: got %d, want %d", status, PUFFS_GIF__ERROR_BAD_RECEIVER);
}
}
void test_basic_initializer_not_called() {
proc_funcname = __func__;
puffs_gif_lzw_decoder dec = {{0}};
puffs_gif__lzw_decoder dec = {{0}};
puffs_base_writer1 dst = {0};
puffs_base_reader1 src = {0};
puffs_gif_status status = puffs_gif_lzw_decoder_decode(&dec, dst, src);
if (status != PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED) {
puffs_gif__status status = puffs_gif__lzw_decoder__decode(&dec, dst, src);
if (status != PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED) {
FAIL("status: got %d, want %d", status,
PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED);
PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED);
}
}
void test_basic_puffs_version_bad() {
proc_funcname = __func__;
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, 0, 0); // 0 is not PUFFS_VERSION.
if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_PUFFS_VERSION) {
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, 0, 0); // 0 is not PUFFS_VERSION.
if (dec.private_impl.status != PUFFS_GIF__ERROR_BAD_PUFFS_VERSION) {
FAIL("status: got %d, want %d", dec.private_impl.status,
PUFFS_GIF_ERROR_BAD_PUFFS_VERSION);
PUFFS_GIF__ERROR_BAD_PUFFS_VERSION);
return;
}
}
void test_basic_puffs_version_good() {
proc_funcname = __func__;
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
if (dec.private_impl.magic != PUFFS_MAGIC) {
FAIL("magic: got %u, want %u", dec.private_impl.magic, PUFFS_MAGIC);
return;
@@ -121,19 +121,19 @@ void test_basic_puffs_version_good() {
void test_basic_status_is_error() {
proc_funcname = __func__;
if (puffs_gif_status_is_error(PUFFS_GIF_STATUS_OK)) {
if (puffs_gif__status__is_error(PUFFS_GIF__STATUS_OK)) {
FAIL("is_error(OK) returned true");
return;
}
if (!puffs_gif_status_is_error(PUFFS_GIF_ERROR_BAD_PUFFS_VERSION)) {
if (!puffs_gif__status__is_error(PUFFS_GIF__ERROR_BAD_PUFFS_VERSION)) {
FAIL("is_error(BAD_PUFFS_VERSION) returned false");
return;
}
if (puffs_gif_status_is_error(PUFFS_GIF_SUSPENSION_SHORT_WRITE)) {
if (puffs_gif__status__is_error(PUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
FAIL("is_error(SHORT_WRITE) returned true");
return;
}
if (!puffs_gif_status_is_error(PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE)) {
if (!puffs_gif__status__is_error(PUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE)) {
FAIL("is_error(LZW_CODE_IS_OUT_OF_RANGE) returned false");
return;
}
@@ -141,32 +141,33 @@ void test_basic_status_is_error() {
void test_basic_status_strings() {
proc_funcname = __func__;
const char* s0 = puffs_gif_status_string(PUFFS_GIF_STATUS_OK);
const char* s0 = puffs_gif__status__string(PUFFS_GIF__STATUS_OK);
const char* t0 = "gif: ok";
if (strcmp(s0, t0)) {
FAIL("got \"%s\", want \"%s\"", s0, t0);
return;
}
const char* s1 = puffs_gif_status_string(PUFFS_GIF_ERROR_BAD_PUFFS_VERSION);
const char* s1 =
puffs_gif__status__string(PUFFS_GIF__ERROR_BAD_PUFFS_VERSION);
const char* t1 = "gif: bad puffs version";
if (strcmp(s1, t1)) {
FAIL("got \"%s\", want \"%s\"", s1, t1);
return;
}
const char* s2 = puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_WRITE);
const char* s2 = puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_WRITE);
const char* t2 = "gif: short write";
if (strcmp(s2, t2)) {
FAIL("got \"%s\", want \"%s\"", s2, t2);
return;
}
const char* s3 =
puffs_gif_status_string(PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE);
puffs_gif__status__string(PUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE);
const char* t3 = "gif: LZW code is out of range";
if (strcmp(s3, t3)) {
FAIL("got \"%s\", want \"%s\"", s3, t3);
return;
}
const char* s4 = puffs_gif_status_string(-254);
const char* s4 = puffs_gif__status__string(-254);
const char* t4 = "gif: unknown status";
if (strcmp(s4, t4)) {
FAIL("got \"%s\", want \"%s\"", s4, t4);
@@ -176,8 +177,8 @@ void test_basic_status_strings() {
void test_basic_sub_struct_initializer() {
proc_funcname = __func__;
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
if (dec.private_impl.magic != PUFFS_MAGIC) {
FAIL("outer magic: got %u, want %u", dec.private_impl.magic, PUFFS_MAGIC);
return;
@@ -224,9 +225,9 @@ bool do_test_puffs_gif_lzw_decode(const char* src_filename,
return false;
}
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif_lzw_decoder_set_literal_width(&dec, literal_width);
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__lzw_decoder__set_literal_width(&dec, literal_width);
puffs_base_writer1 got_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
int num_iters = 0;
@@ -243,24 +244,24 @@ bool do_test_puffs_gif_lzw_decode(const char* src_filename,
size_t old_wi = got.wi;
size_t old_ri = src.ri;
puffs_gif_status status =
puffs_gif_lzw_decoder_decode(&dec, got_writer, src_reader);
if (status == PUFFS_GIF_STATUS_OK) {
puffs_gif__status status =
puffs_gif__lzw_decoder__decode(&dec, got_writer, src_reader);
if (status == PUFFS_GIF__STATUS_OK) {
if (src.ri != src.wi) {
FAIL("decode returned ok but src was not exhausted");
return false;
}
break;
}
if ((status != PUFFS_GIF_SUSPENSION_SHORT_READ) &&
(status != PUFFS_GIF_SUSPENSION_SHORT_WRITE)) {
if ((status != PUFFS_GIF__SUSPENSION_SHORT_READ) &&
(status != PUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s) or %" PRIi32
" (%s)",
status, puffs_gif_status_string(status),
PUFFS_GIF_SUSPENSION_SHORT_READ,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_READ),
PUFFS_GIF_SUSPENSION_SHORT_WRITE,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_WRITE));
status, puffs_gif__status__string(status),
PUFFS_GIF__SUSPENSION_SHORT_READ,
puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_READ),
PUFFS_GIF__SUSPENSION_SHORT_WRITE,
puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_WRITE));
return false;
}
@@ -354,12 +355,12 @@ bool do_bench_puffs_gif_lzw_decode(const char* filename, uint64_t reps) {
for (i = 0; i < reps; i++) {
dst.wi = 0;
src.ri = 1; // Skip the literal width.
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif_status s =
puffs_gif_lzw_decoder_decode(&dec, dst_writer, src_reader);
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__status s =
puffs_gif__lzw_decoder__decode(&dec, dst_writer, src_reader);
if (s) {
FAIL("decode: %" PRIi32 " (%s)", s, puffs_gif_status_string(s));
FAIL("decode: %" PRIi32 " (%s)", s, puffs_gif__status__string(s));
return false;
}
n_bytes += dst.wi;
@@ -382,13 +383,14 @@ void bench_puffs_gif_lzw_decode_100k() {
// ---------------- GIF Tests
const char* puffs_gif_decode(puffs_base_buf1* dst, puffs_base_buf1* src) {
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 dst_writer = {.buf = dst};
puffs_base_reader1 src_reader = {.buf = src};
puffs_gif_status s = puffs_gif_decoder_decode(&dec, dst_writer, src_reader);
puffs_gif__status s =
puffs_gif__decoder__decode(&dec, dst_writer, src_reader);
if (s) {
return puffs_gif_status_string(s);
return puffs_gif__status__string(s);
}
return NULL;
}
@@ -405,8 +407,8 @@ bool do_test_puffs_gif_decode(const char* filename,
return false;
}
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 got_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
int num_iters = 0;
@@ -423,24 +425,24 @@ bool do_test_puffs_gif_decode(const char* filename,
size_t old_wi = got.wi;
size_t old_ri = src.ri;
puffs_gif_status status =
puffs_gif_decoder_decode(&dec, got_writer, src_reader);
if (status == PUFFS_GIF_STATUS_OK) {
puffs_gif__status status =
puffs_gif__decoder__decode(&dec, got_writer, src_reader);
if (status == PUFFS_GIF__STATUS_OK) {
if (src.ri != src.wi) {
FAIL("decode returned ok but src was not exhausted");
return false;
}
break;
}
if ((status != PUFFS_GIF_SUSPENSION_SHORT_READ) &&
(status != PUFFS_GIF_SUSPENSION_SHORT_WRITE)) {
if ((status != PUFFS_GIF__SUSPENSION_SHORT_READ) &&
(status != PUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s) or %" PRIi32
" (%s)",
status, puffs_gif_status_string(status),
PUFFS_GIF_SUSPENSION_SHORT_READ,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_READ),
PUFFS_GIF_SUSPENSION_SHORT_WRITE,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_WRITE));
status, puffs_gif__status__string(status),
PUFFS_GIF__SUSPENSION_SHORT_READ,
puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_READ),
PUFFS_GIF__SUSPENSION_SHORT_WRITE,
puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_WRITE));
return false;
}
@@ -538,17 +540,17 @@ void test_puffs_gif_decode_input_is_a_png() {
return;
}
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 got_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
puffs_gif_status status =
puffs_gif_decoder_decode(&dec, got_writer, src_reader);
if (status != PUFFS_GIF_ERROR_BAD_GIF_HEADER) {
puffs_gif__status status =
puffs_gif__decoder__decode(&dec, got_writer, src_reader);
if (status != PUFFS_GIF__ERROR_BAD_GIF_HEADER) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
puffs_gif_status_string(status), PUFFS_GIF_ERROR_BAD_GIF_HEADER,
puffs_gif_status_string(PUFFS_GIF_ERROR_BAD_GIF_HEADER));
puffs_gif__status__string(status), PUFFS_GIF__ERROR_BAD_GIF_HEADER,
puffs_gif__status__string(PUFFS_GIF__ERROR_BAD_GIF_HEADER));
return;
}
}