mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Rename buf1's cap to len.
This commit is contained in:
1 parent
e49ec3fd90
commit
45cecca79a
6 files changed
+15
-15
No files matched your search
@@ -29,14 +29,14 @@
|
||||
// TODO: don't hard code this in base-header.h.
|
||||
#define PUFFS_VERSION (0x00001)
|
||||
|
||||
// puffs_base_buf1 is a 1-dimensional buffer (a pointer and capacity) plus
|
||||
// puffs_base_buf1 is a 1-dimensional buffer (a pointer and length) plus
|
||||
// additional indexes into that buffer.
|
||||
//
|
||||
// A value with all fields NULL or zero is a valid, empty buffer.
|
||||
typedef struct {
|
||||
uint8_t* ptr; // Pointer.
|
||||
size_t cap; // Capacity.
|
||||
size_t wi; // Write index. Invariant: wi <= cap.
|
||||
size_t len; // Length.
|
||||
size_t wi; // Write index. Invariant: wi <= len.
|
||||
size_t ri; // Read index. Invariant: ri <= wi.
|
||||
} puffs_base_buf1;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ package main
|
||||
|
||||
const baseHeader = "" +
|
||||
"#ifndef PUFFS_BASE_HEADER_H\n#define PUFFS_BASE_HEADER_H\n\n// Use of this source code is governed by a BSD-style license that can be found\n// in the LICENSE file.\n\n#include <stdbool.h>\n#include <stdint.h>\n#include <string.h>\n\n// Puffs requires a word size of at least 32 bits because it assumes that\n// converting a u32 to usize will never overflow. For example, the size of a\n// decoded image is often represented, explicitly or implicitly in an image\n// file, as a u32, and it is convenient to compare that to a buffer size.\n#if __WORDSIZE < 32\n#error \"Puffs requires a word size of at least 32 bits\"\n#endif\n\n// PUFFS_VERSION is the major.minor version number as a uint32. The major\n// number is the high 16 bits. The minor number is the low 16 bits.\n//\n// The intention is to bump the version number at least on every API / ABI\n// backwards incompatible change.\n//\n// For now, the API and ABI are simply unstable and can change at any time.\n//\n// TODO: don't hard code this in base-header.h.\n#define PUFFS_VERSION (0x00001)" +
|
||||
"\n\n// puffs_base_buf1 is a 1-dimensional buffer (a pointer and capacity) plus\n// additional indexes into that buffer.\n//\n// A value with all fields NULL or zero is a valid, empty buffer.\ntypedef struct {\n uint8_t* ptr; // Pointer.\n size_t cap; // Capacity.\n size_t wi; // Write index. Invariant: wi <= cap.\n size_t ri; // Read index. Invariant: ri <= wi.\n} puffs_base_buf1;\n\n#endif // PUFFS_BASE_HEADER_H\n" +
|
||||
"\n\n// puffs_base_buf1 is a 1-dimensional buffer (a pointer and length) plus\n// additional indexes into that buffer.\n//\n// A value with all fields NULL or zero is a valid, empty buffer.\ntypedef struct {\n uint8_t* ptr; // Pointer.\n size_t len; // Length.\n size_t wi; // Write index. Invariant: wi <= len.\n size_t ri; // Read index. Invariant: ri <= wi.\n} puffs_base_buf1;\n\n#endif // PUFFS_BASE_HEADER_H\n" +
|
||||
""
|
||||
|
||||
const baseImpl = "" +
|
||||
|
||||
+3
-3
@@ -32,14 +32,14 @@
|
||||
// TODO: don't hard code this in base-header.h.
|
||||
#define PUFFS_VERSION (0x00001)
|
||||
|
||||
// puffs_base_buf1 is a 1-dimensional buffer (a pointer and capacity) plus
|
||||
// puffs_base_buf1 is a 1-dimensional buffer (a pointer and length) plus
|
||||
// additional indexes into that buffer.
|
||||
//
|
||||
// A value with all fields NULL or zero is a valid, empty buffer.
|
||||
typedef struct {
|
||||
uint8_t* ptr; // Pointer.
|
||||
size_t cap; // Capacity.
|
||||
size_t wi; // Write index. Invariant: wi <= cap.
|
||||
size_t len; // Length.
|
||||
size_t wi; // Write index. Invariant: wi <= len.
|
||||
size_t ri; // Read index. Invariant: ri <= wi.
|
||||
} puffs_base_buf1;
|
||||
|
||||
|
||||
+3
-3
@@ -32,14 +32,14 @@
|
||||
// TODO: don't hard code this in base-header.h.
|
||||
#define PUFFS_VERSION (0x00001)
|
||||
|
||||
// puffs_base_buf1 is a 1-dimensional buffer (a pointer and capacity) plus
|
||||
// puffs_base_buf1 is a 1-dimensional buffer (a pointer and length) plus
|
||||
// additional indexes into that buffer.
|
||||
//
|
||||
// A value with all fields NULL or zero is a valid, empty buffer.
|
||||
typedef struct {
|
||||
uint8_t* ptr; // Pointer.
|
||||
size_t cap; // Capacity.
|
||||
size_t wi; // Write index. Invariant: wi <= cap.
|
||||
size_t len; // Length.
|
||||
size_t wi; // Write index. Invariant: wi <= len.
|
||||
size_t ri; // Read index. Invariant: ri <= wi.
|
||||
} puffs_base_buf1;
|
||||
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@ uint8_t global_dst_buffer[BUFFER_SIZE];
|
||||
uint8_t global_src_buffer[BUFFER_SIZE];
|
||||
|
||||
void test_lzw_decode() {
|
||||
puffs_base_buf1 dst = {.ptr = global_dst_buffer, .cap = BUFFER_SIZE};
|
||||
puffs_base_buf1 src = {.ptr = global_src_buffer, .cap = BUFFER_SIZE};
|
||||
puffs_base_buf1 dst = {.ptr = global_dst_buffer, .len = BUFFER_SIZE};
|
||||
puffs_base_buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
if (!read_file(&src, "../../testdata/bricks-nodither.giflzw")) {
|
||||
goto cleanup0;
|
||||
}
|
||||
|
||||
@@ -50,11 +50,11 @@ bool read_file(puffs_base_buf1* dst, const char* path) {
|
||||
return false;
|
||||
}
|
||||
uint8_t* ptr = dst->ptr + dst->wi;
|
||||
size_t cap = dst->cap - dst->wi;
|
||||
size_t len = dst->len - dst->wi;
|
||||
while (true) {
|
||||
size_t n = fread(ptr, 1, cap, f);
|
||||
size_t n = fread(ptr, 1, len, f);
|
||||
ptr += n;
|
||||
cap -= n;
|
||||
len -= n;
|
||||
dst->wi += n;
|
||||
if (feof(f)) {
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user