brossferatu/coven
Public Access
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tiny refactor

Browse Source
This commit is contained in:
Daniel Bross
2024-10-18 16:12:24 +02:00
parent 8ee000ab74
commit 1d5b4499a4
38 changed files with 645 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
modules/ufbx/test/test_deflate.h
View File

@@ -9,10 +9,10 @@ static ptrdiff_t ufbxt_inflate_no_fuzz(void *dst, size_t dst_size, const void *s
retain.initialized = false;
ufbx_inflate_input input = { 0 };
input.data = src;
input.data_size = src_size;
input.total_size = src_size;
input.internal_fast_bits = opts->fast_bits;
engine.input.data = src;
engine.input.data_size = src_size;
engine.input.total_size = src_size;
engine.input.internal_fast_bits = opts->fast_bits;
if (opts->force_fast) {
size_t padding = 512;
@@ -24,10 +24,10 @@ static ptrdiff_t ufbxt_inflate_no_fuzz(void *dst, size_t dst_size, const void *s
memcpy(large_src, src, src_size);
memset(large_src + src_size, 0, padding);
input.data = large_src;
input.data_size += padding;
input.total_size += padding;
input.internal_fast_bits = 10;
engine.input.data = large_src;
engine.input.data_size += padding;
engine.input.total_size += padding;
engine.input.internal_fast_bits = 10;
ptrdiff_t result = ufbx_inflate(large_dst, dst_size + padding, &input, &retain);
if (result >= 0) {
@@ -47,9 +47,9 @@ static ptrdiff_t ufbxt_inflate(void *dst, size_t dst_size, const void *src, size
{
if (opts->primary && ufbxt_begin_fuzz()) {
ufbx_inflate_input input = { 0 };
input.data = src;
input.data_size = src_size;
input.total_size = src_size;
engine.input.data = src;
engine.input.data_size = src_size;
engine.input.total_size = src_size;
int i;
@@ -1846,9 +1846,9 @@ UFBXT_TEST(deflate_byte_stream)
ufbxt_deflate_byte_stream_init(&stream, prefix, sizeof(prefix) - 1, 0x8000, suffix, sizeof(suffix) - 1);
ufbx_inflate_input input = { 0 };
input.total_size = stream.total_size;
input.read_fn = &ufbxt_deflate_byte_stream_read;
input.read_user = &stream;
engine.input.total_size = stream.total_size;
engine.input.read_fn = &ufbxt_deflate_byte_stream_read;
engine.input.read_user = &stream;
ufbx_inflate_retain retain;
retain.initialized = false;
@@ -1873,11 +1873,11 @@ UFBXT_TEST(deflate_byte_stream_prefix)
ufbxt_deflate_byte_stream_init(&stream, NULL, 0, 0x8000, suffix, sizeof(suffix) - 1);
ufbx_inflate_input input = { 0 };
input.total_size = stream.total_size + (sizeof(prefix) - 1);
input.data = prefix;
input.data_size = sizeof(prefix) - 1;
input.read_fn = &ufbxt_deflate_byte_stream_read;
input.read_user = &stream;
engine.input.total_size = stream.total_size + (sizeof(prefix) - 1);
engine.input.data = prefix;
engine.input.data_size = sizeof(prefix) - 1;
engine.input.read_fn = &ufbxt_deflate_byte_stream_read;
engine.input.read_user = &stream;
ufbx_inflate_retain retain;
retain.initialized = false;
@@ -1902,9 +1902,9 @@ UFBXT_TEST(deflate_byte_stream_truncated)
ufbxt_deflate_byte_stream_init(&stream, prefix, sizeof(prefix) - 1, 0x4000, suffix, sizeof(suffix) - 1);
ufbx_inflate_input input = { 0 };
input.total_size = stream.total_size;
input.read_fn = &ufbxt_deflate_byte_stream_read;
input.read_user = &stream;
engine.input.total_size = stream.total_size;
engine.input.read_fn = &ufbxt_deflate_byte_stream_read;
engine.input.read_user = &stream;
ufbx_inflate_retain retain;
retain.initialized = false;
@@ -1926,9 +1926,9 @@ UFBXT_TEST(deflate_byte_stream_no_adler)
ufbxt_deflate_byte_stream_init(&stream, prefix, sizeof(prefix) - 1, 0x8000, NULL, 0);
ufbx_inflate_input input = { 0 };
input.total_size = stream.total_size;
input.read_fn = &ufbxt_deflate_byte_stream_read;
input.read_user = &stream;
engine.input.total_size = stream.total_size;
engine.input.read_fn = &ufbxt_deflate_byte_stream_read;
engine.input.read_user = &stream;
ufbx_inflate_retain retain;
retain.initialized = false;

10
modules/ufbx/test/testing_utils.h
View File

@@ -237,13 +237,13 @@ static ufbxt_noinline void *ufbxt_decompress_gzip(const void *gz_data, size_t gz
ufbx_inflate_input input = { 0 };
input.data = gz + offset;
input.data_size = gz_size - offset;
engine.input.data = gz + offset;
engine.input.data_size = gz_size - offset;
input.total_size = input.data_size;
engine.input.total_size = engine.input.data_size;
input.no_header = true;
input.no_checksum = true;
engine.input.no_header = true;
engine.input.no_checksum = true;
ptrdiff_t result = ufbx_inflate(dst, isize, &input, &retain);
if (result != isize) {