Rename buf1, reader1, etc to io_buffer, io_reader

Also remove the unused Buf1, Buf2 and Usize tokens.
This commit is contained in:
Nigel Tao committed 2018-04-05 20:49:48 +10:00
1 parent 82a48796c8
commit 97aab37462
46 files changed
+823 -847

No files matched your search

+7 -7
View File
@@ -26,7 +26,7 @@ void intentional_segfault() {
*intentional_segfault_ptr = 0;
}
void fuzz(wuffs_base__reader1 src_reader, uint32_t hash);
void fuzz(wuffs_base__io_reader src_reader, uint32_t hash);
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
// Hash input as per https://en.wikipedia.org/wiki/Jenkins_hash_function
@@ -41,12 +41,12 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
hash ^= hash >> 11;
hash += hash << 15;
wuffs_base__buf1 src = {.ptr = (uint8_t*)(data),
.len = size,
.wi = size,
.ri = 0,
.closed = true};
fuzz((wuffs_base__reader1){.buf = &src}, hash);
wuffs_base__io_buffer src = {.ptr = (uint8_t*)(data),
.len = size,
.wi = size,
.ri = 0,
.closed = true};
fuzz((wuffs_base__io_reader){.buf = &src}, hash);
return 0;
}
+3 -3
View File
@@ -38,7 +38,7 @@ It should print "PASS", amongst other information, and exit(0).
#include "../../../gen/c/std/gif.c"
#include "../fuzzlib/fuzzlib.cc"
void fuzz(wuffs_base__reader1 src_reader, uint32_t hash) {
void fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
void* pixbuf = NULL;
// Use a {} code block so that "goto exit" doesn't trigger "jump bypasses
@@ -64,8 +64,8 @@ void fuzz(wuffs_base__reader1 src_reader, uint32_t hash) {
goto exit;
}
wuffs_base__buf1 dst = {.ptr = (uint8_t*)(pixbuf), .len = pixbuf_size};
wuffs_base__writer1 dst_writer = {.buf = &dst};
wuffs_base__io_buffer dst = {.ptr = (uint8_t*)(pixbuf), .len = pixbuf_size};
wuffs_base__io_writer dst_writer = {.buf = &dst};
while (true) {
// TODO: handle the frame rect being larger than the image rect. The
+3 -3
View File
@@ -39,7 +39,7 @@ It should print "PASS", amongst other information, and exit(0).
#include "../../../gen/c/std/zlib.c"
#include "../fuzzlib/fuzzlib.cc"
void fuzz(wuffs_base__reader1 src_reader, uint32_t hash) {
void fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
wuffs_zlib__status s;
wuffs_zlib__decoder dec;
wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0);
@@ -51,8 +51,8 @@ void fuzz(wuffs_base__reader1 src_reader, uint32_t hash) {
const size_t dstbuf_size = 65536;
uint8_t dstbuf[dstbuf_size];
wuffs_base__buf1 dst = {.ptr = dstbuf, .len = dstbuf_size};
wuffs_base__writer1 dst_writer = {.buf = &dst};
wuffs_base__io_buffer dst = {.ptr = dstbuf, .len = dstbuf_size};
wuffs_base__io_writer dst_writer = {.buf = &dst};
while (true) {
dst.wi = 0;