Remove the obsolete puffs_base__limit1 concept.

This commit is contained in:
Nigel Tao committed 2017-10-27 07:51:57 +11:00
1 parent e0836d73a8
commit 3485950a3f
10 files changed
+17 -443

No files matched your search

+5 -203
View File
@@ -68,20 +68,8 @@ typedef struct {
bool closed; // No further writes are expected.
} puffs_base__buf1;
// puffs_base__limit1 provides a limited view of a 1-dimensional byte stream:
// its first N bytes. That N can be greater than a buffer's current read or
// write capacity. N decreases naturally over time as bytes are read from or
// written to the stream.
//
// A value with all fields NULL or zero is a valid, unlimited view.
typedef struct puffs_base__limit1 {
uint64_t* ptr_to_len; // Pointer to N.
struct puffs_base__limit1* next; // Linked list of limits.
} puffs_base__limit1;
typedef struct {
puffs_base__buf1* buf;
puffs_base__limit1 limit; // TODO: delete.
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
bool use_limitt;
// Do not access the private_impl's fields directly. There is no API/ABI
@@ -93,7 +81,6 @@ typedef struct {
typedef struct {
puffs_base__buf1* buf;
puffs_base__limit1 limit; // TODO: delete.
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
bool use_limitt;
// Do not access the private_impl's fields directly. There is no API/ABI
@@ -869,12 +856,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode(
if (a_dst.use_limitt && (len > a_dst.limitt)) {
len = a_dst.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_wend_dst += len;
}
}
@@ -898,12 +879,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode(
if (a_dst.use_limitt) {
a_dst.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
puffs_flate__status t_0 =
puffs_flate__flate_decoder__decode_blocks(self, a_dst, a_src);
@@ -915,12 +890,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode(
if (a_dst.use_limitt && (len > a_dst.limitt)) {
len = a_dst.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_wend_dst += len;
}
}
@@ -990,12 +959,6 @@ exit:
if (a_dst.use_limitt) {
a_dst.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst);
}
@@ -1020,12 +983,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -1063,12 +1020,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status =
puffs_flate__flate_decoder__decode_uncompressed(self, a_dst, a_src);
@@ -1078,12 +1029,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
@@ -1104,12 +1049,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_flate__flate_decoder__init_dynamic_huffman(self, a_src);
if (a_src.buf) {
@@ -1118,12 +1057,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
@@ -1140,12 +1073,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_flate__flate_decoder__decode_huffman(self, a_dst, a_src);
if (a_src.buf) {
@@ -1154,12 +1081,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
@@ -1186,20 +1107,13 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1226,12 +1140,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_uncompressed(
if (a_dst.use_limitt && (len > a_dst.limitt)) {
len = a_dst.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_wend_dst += len;
}
}
@@ -1243,12 +1151,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_uncompressed(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -1337,12 +1239,6 @@ exit:
if (a_dst.use_limitt) {
a_dst.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst);
}
if (a_src.buf) {
@@ -1351,20 +1247,13 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1402,12 +1291,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman(
if (a_dst.use_limitt && (len > a_dst.limitt)) {
len = a_dst.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_wend_dst += len;
}
}
@@ -1419,12 +1302,6 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -1761,12 +1638,6 @@ exit:
if (a_dst.use_limitt) {
a_dst.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst);
}
if (a_src.buf) {
@@ -1775,20 +1646,13 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1883,12 +1747,6 @@ puffs_flate__status puffs_flate__flate_decoder__init_dynamic_huffman(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -2097,20 +1955,13 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -2427,12 +2278,6 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
if (a_dst.use_limitt && (len > a_dst.limitt)) {
len = a_dst.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_wend_dst += len;
}
}
@@ -2444,12 +2289,6 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -2514,12 +2353,6 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
if (a_dst.use_limitt) {
a_dst.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
@@ -2527,12 +2360,6 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
puffs_flate__status t_2 = puffs_flate__flate_decoder__decode(
&self->private_impl.f_flate, a_dst, a_src);
@@ -2544,12 +2371,6 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
if (a_dst.use_limitt && (len > a_dst.limitt)) {
len = a_dst.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_wend_dst += len;
}
}
@@ -2559,12 +2380,6 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
v_z = t_2;
@@ -2633,12 +2448,6 @@ exit:
if (a_dst.use_limitt) {
a_dst.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst);
}
if (a_src.buf) {
@@ -2647,12 +2456,6 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
@@ -2660,8 +2463,7 @@ exit:
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
+6 -169
View File
@@ -68,20 +68,8 @@ typedef struct {
bool closed; // No further writes are expected.
} puffs_base__buf1;
// puffs_base__limit1 provides a limited view of a 1-dimensional byte stream:
// its first N bytes. That N can be greater than a buffer's current read or
// write capacity. N decreases naturally over time as bytes are read from or
// written to the stream.
//
// A value with all fields NULL or zero is a valid, unlimited view.
typedef struct puffs_base__limit1 {
uint64_t* ptr_to_len; // Pointer to N.
struct puffs_base__limit1* next; // Linked list of limits.
} puffs_base__limit1;
typedef struct {
puffs_base__buf1* buf;
puffs_base__limit1 limit; // TODO: delete.
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
bool use_limitt;
// Do not access the private_impl's fields directly. There is no API/ABI
@@ -93,7 +81,6 @@ typedef struct {
typedef struct {
puffs_base__buf1* buf;
puffs_base__limit1 limit; // TODO: delete.
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
bool use_limitt;
// Do not access the private_impl's fields directly. There is no API/ABI
@@ -717,12 +704,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -740,12 +721,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif__decoder__decode_header(self, a_src);
if (a_src.buf) {
@@ -754,12 +729,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
@@ -772,12 +741,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif__decoder__decode_lsd(self, a_src);
if (a_src.buf) {
@@ -786,12 +749,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
@@ -812,12 +769,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif__decoder__decode_extension(self, a_src);
if (a_src.buf) {
@@ -826,12 +777,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
@@ -845,12 +790,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
status = puffs_gif__decoder__decode_id(self, a_dst, a_src);
if (a_src.buf) {
@@ -859,12 +798,6 @@ puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
if (status) {
@@ -897,12 +830,6 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
@@ -910,8 +837,7 @@ exit:
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -934,12 +860,6 @@ puffs_gif__status puffs_gif__decoder__decode_header(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -988,20 +908,13 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1025,12 +938,6 @@ puffs_gif__status puffs_gif__decoder__decode_lsd(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -1105,20 +1012,13 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1142,12 +1042,6 @@ puffs_gif__status puffs_gif__decoder__decode_extension(
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -1218,20 +1112,13 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1260,12 +1147,6 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -1333,12 +1214,6 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
puffs_gif__status t_3 = puffs_gif__lzw_decoder__decode(
&self->private_impl.f_lzw, a_dst, v_r);
@@ -1348,12 +1223,6 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
v_z = t_3;
@@ -1412,20 +1281,13 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1489,12 +1351,6 @@ puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self,
if (a_dst.use_limitt && (len > a_dst.limitt)) {
len = a_dst.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_wend_dst += len;
}
}
@@ -1506,12 +1362,6 @@ puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self,
if (a_src.use_limitt && (len > a_src.limitt)) {
len = a_src.limitt;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
@@ -1655,12 +1505,6 @@ exit:
if (a_dst.use_limitt) {
a_dst.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_dst.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst);
}
if (a_src.buf) {
@@ -1669,12 +1513,6 @@ exit:
if (a_src.use_limitt) {
a_src.limitt -= n;
}
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src);
}
@@ -1682,8 +1520,7 @@ exit:
return status;
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len &&
!a_src.use_limitt) {
if (a_src.buf && a_src.buf->closed && !a_src.use_limitt) {
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
-13
View File
@@ -68,20 +68,8 @@ typedef struct {
bool closed; // No further writes are expected.
} puffs_base__buf1;
// puffs_base__limit1 provides a limited view of a 1-dimensional byte stream:
// its first N bytes. That N can be greater than a buffer's current read or
// write capacity. N decreases naturally over time as bytes are read from or
// written to the stream.
//
// A value with all fields NULL or zero is a valid, unlimited view.
typedef struct puffs_base__limit1 {
uint64_t* ptr_to_len; // Pointer to N.
struct puffs_base__limit1* next; // Linked list of limits.
} puffs_base__limit1;
typedef struct {
puffs_base__buf1* buf;
puffs_base__limit1 limit; // TODO: delete.
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
bool use_limitt;
// Do not access the private_impl's fields directly. There is no API/ABI
@@ -93,7 +81,6 @@ typedef struct {
typedef struct {
puffs_base__buf1* buf;
puffs_base__limit1 limit; // TODO: delete.
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
bool use_limitt;
// Do not access the private_impl's fields directly. There is no API/ABI
-13
View File
@@ -68,20 +68,8 @@ typedef struct {
bool closed; // No further writes are expected.
} puffs_base__buf1;
// puffs_base__limit1 provides a limited view of a 1-dimensional byte stream:
// its first N bytes. That N can be greater than a buffer's current read or
// write capacity. N decreases naturally over time as bytes are read from or
// written to the stream.
//
// A value with all fields NULL or zero is a valid, unlimited view.
typedef struct puffs_base__limit1 {
uint64_t* ptr_to_len; // Pointer to N.
struct puffs_base__limit1* next; // Linked list of limits.
} puffs_base__limit1;
typedef struct {
puffs_base__buf1* buf;
puffs_base__limit1 limit; // TODO: delete.
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
bool use_limitt;
// Do not access the private_impl's fields directly. There is no API/ABI
@@ -93,7 +81,6 @@ typedef struct {
typedef struct {
puffs_base__buf1* buf;
puffs_base__limit1 limit; // TODO: delete.
uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?
bool use_limitt;
// Do not access the private_impl's fields directly. There is no API/ABI