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

-13
View File
@@ -65,20 +65,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
@@ -90,7 +78,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
+3 -4
View File
@@ -19,8 +19,8 @@ package cgen
const baseHeader = "" +
"#ifndef PUFFS_BASE_HEADER_H\n#define PUFFS_BASE_HEADER_H\n\n// Copyright 2017 The Puffs Authors.\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// https://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\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//\n// Si" +
"milarly, the word size is at most 64 bits because it assumes that\n// converting a usize to u64 will never overflow.\n#if __WORDSIZE < 32\n#error \"Puffs requires a word size of at least 32 bits\"\n#elif __WORDSIZE > 64\n#error \"Puffs requires a word size of at most 64 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__slice_u8 is a 1-dimensional buffer (a pointer and length).\n//\n// A value with all fields NULL or zero is a valid, empty slice.\ntypedef struct {\n uint8_t* ptr;\n size_t len;\n} puffs_base__slice_u8;\n\n// puffs_base__buf1 is a 1-dimensional buffer (a pointer and length), plus\n// additional indexes into that buffer, p" +
"lus an opened / closed flag.\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 bool closed; // No further writes are expected.\n} puffs_base__buf1;\n\n// puffs_base__limit1 provides a limited view of a 1-dimensional byte stream:\n// its first N bytes. That N can be greater than a buffer's current read or\n// write capacity. N decreases naturally over time as bytes are read from or\n// written to the stream.\n//\n// A value with all fields NULL or zero is a valid, unlimited view.\ntypedef struct puffs_base__limit1 {\n uint64_t* ptr_to_len; // Pointer to N.\n struct puffs_base__limit1* next; // Linked list of limits.\n} puffs_base__limit1;\n\ntypedef struct {\n puffs_base__buf1* buf;\n puffs_base__limit1 limit; // TODO: delete.\n uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?\n b" +
"ool use_limitt;\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t* mark;\n } private_impl;\n} puffs_base__reader1;\n\ntypedef struct {\n puffs_base__buf1* buf;\n puffs_base__limit1 limit; // TODO: delete.\n uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?\n bool use_limitt;\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t* mark;\n } private_impl;\n} puffs_base__writer1;\n\n#endif // PUFFS_BASE_HEADER_H\n" +
"lus an opened / closed flag.\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 bool closed; // No further writes are expected.\n} puffs_base__buf1;\n\ntypedef struct {\n puffs_base__buf1* buf;\n uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?\n bool use_limitt;\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t* mark;\n } private_impl;\n} puffs_base__reader1;\n\ntypedef struct {\n puffs_base__buf1* buf;\n uint64_t limitt; // TODO: should this be uint8_t*, not (uint64_t + bool)?\n bool use_limitt;\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t* mark;\n } private_impl;\n} puffs_base__writ" +
"er1;\n\n#endif // PUFFS_BASE_HEADER_H\n" +
""
const baseImpl = "" +
@@ -42,8 +42,7 @@ type template_args_short_read struct {
}
func template_short_read(b *buffer, args template_args_short_read) error {
b.printf("short_read_%s:\nif (a_%s.buf && a_%s.buf->closed && !a_%s.limit.ptr_to_len &&\n!a_%s.use_limitt) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n",
args.name,
b.printf("short_read_%s:\nif (a_%s.buf && a_%s.buf->closed && !a_%s.use_limitt) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n",
args.name,
args.name,
args.name,
+1 -9
View File
@@ -416,15 +416,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
return nil
case t.KeyLimit:
// TODO: don't hard code so much detail.
b.writes("(puffs_base__reader1) {")
b.writes(".buf = a_src.buf,")
b.writes(".limit = (puffs_base__limit1) {")
b.printf(".ptr_to_len = &%s%s,", lPrefix, g.currFunk.limitVarName)
b.writes(".next = &a_src.limit,")
b.writes("}}")
g.currFunk.limitVarName = ""
return nil
panic("TODO: delete t.KeyLimit")
}
return fmt.Errorf("unrecognized token.Key (0x%X) for writeExprOther", n.ID0().Key())
}
+1 -1
View File
@@ -38,7 +38,7 @@ type funk struct {
public bool
suspendible bool
usesScratch bool
limitVarName string
limitVarName string // TODO: delete.
shortReads []string
}
+1 -2
View File
@@ -23,8 +23,7 @@
template short_read(string qPKGPREFIXq, string qnameq) {
short_read_qnameq:
if (a_qnameq.buf && a_qnameq.buf->closed && !a_qnameq.limit.ptr_to_len &&
!a_qnameq.use_limitt) {
if (a_qnameq.buf && a_qnameq.buf->closed && !a_qnameq.use_limitt) {
status = qPKGPREFIXqERROR_UNEXPECTED_EOF;
goto exit;
}
-16
View File
@@ -103,10 +103,6 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header
b.printf("uint64_t len = %s%s.buf->wi - %s%s.buf->ri;", aPrefix, nameStr, aPrefix, nameStr)
b.printf("if (%s%s.use_limitt && (len > %s%s.limitt)) { len = %s%s.limitt; }",
aPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
b.printf("puffs_base__limit1* lim;")
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
b.printf("}")
b.printf("%srend_%s = %srptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr)
b.printf("}\n")
@@ -125,10 +121,6 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header
b.printf("uint64_t len = %s%s.buf->len - %s%s.buf->wi;", aPrefix, nameStr, aPrefix, nameStr)
b.printf("if (%s%s.use_limitt && (len > %s%s.limitt)) { len = %s%s.limitt; }",
aPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
b.printf("puffs_base__limit1* lim;")
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
b.printf("}")
b.printf("%swend_%s += len;", bPrefix, nameStr)
b.printf("}\n")
@@ -160,10 +152,6 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer
b.printf("%s%s.buf->ri += n;", aPrefix, nameStr)
// TODO: Should limitt be a uint8_t*, not a uint64_t?
b.printf("if (%s%s.use_limitt) { %s%s.limitt -= n; }", aPrefix, nameStr, aPrefix, nameStr)
b.printf("puffs_base__limit1* lim;")
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
b.printf("}")
if footer {
b.printf("PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srend_%s);", bPrefix, nameStr)
@@ -179,10 +167,6 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer
b.printf("%s%s.buf->wi += n;", aPrefix, nameStr)
// TODO: Should limitt be a uint8_t*, not a uint64_t?
b.printf("if (%s%s.use_limitt) { %s%s.limitt -= n; }", aPrefix, nameStr, aPrefix, nameStr)
b.printf("puffs_base__limit1* lim;")
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
b.printf("}")
if footer {
b.printf("PUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swend_%s);", bPrefix, nameStr)
+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