mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Add a wuffs_base__io_buffer__compact function
This commit is contained in:
1 parent
6670445122
commit
1bdfc4cda2
18 files changed
+246
-15
No files matched your search
@@ -687,6 +687,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -59,7 +59,8 @@ const basePublicH = "" +
|
||||
"(\n wuffs_base__rect_ie_u32 r,\n wuffs_base__rect_ie_u32 s) {\n if (wuffs_base__rect_ie_u32__is_empty(r)) {\n return s;\n }\n if (wuffs_base__rect_ie_u32__is_empty(s)) {\n return r;\n }\n r.min_incl_x = wuffs_base__u32__min(r.min_incl_x, s.min_incl_x);\n r.min_incl_y = wuffs_base__u32__min(r.min_incl_y, s.min_incl_y);\n r.max_excl_x = wuffs_base__u32__max(r.max_excl_x, s.max_excl_x);\n r.max_excl_y = wuffs_base__u32__max(r.max_excl_y, s.max_excl_y);\n return r;\n}\n\nstatic inline uint32_t wuffs_base__rect_ie_u32__width(\n wuffs_base__rect_ie_u32 r) {\n return wuffs_base__u32__sat_sub(r.max_excl_x, r.min_incl_x);\n}\n\nstatic inline uint32_t wuffs_base__rect_ie_u32__height(\n wuffs_base__rect_ie_u32 r) {\n return wuffs_base__u32__sat_sub(r.max_excl_y, r.min_incl_y);\n}\n\n" +
|
||||
"" +
|
||||
"// ---------------- I/O\n\n// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and length), plus\n// additional indexes into that buffer, plus 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} wuffs_base__io_buffer;\n\ntypedef struct {\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 wuffs_base__io_buffer* buf;\n // The bounds values are typically NULL, when created by the Wuffs public\n // API. NULL means that the callee substitutes the implicit bounds derived\n // from buf.\n uint8_t* bounds[2];\n } private_impl;\n} wuffs_base__io_reader;\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/A" +
|
||||
"BI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__io_buffer* buf;\n // The bounds values are typically NULL, when created by the Wuffs public\n // API. NULL means that the callee substitutes the implicit bounds derived\n // from buf.\n uint8_t* bounds[2];\n } private_impl;\n} wuffs_base__io_writer;\n\nstatic inline wuffs_base__io_reader wuffs_base__io_buffer__reader(\n wuffs_base__io_buffer* buf) {\n wuffs_base__io_reader ret = ((wuffs_base__io_reader){});\n ret.private_impl.buf = buf;\n return ret;\n}\n\nstatic inline wuffs_base__io_writer wuffs_base__io_buffer__writer(\n wuffs_base__io_buffer* buf) {\n wuffs_base__io_writer ret = ((wuffs_base__io_writer){});\n ret.private_impl.buf = buf;\n return ret;\n}\n\n" +
|
||||
"BI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__io_buffer* buf;\n // The bounds values are typically NULL, when created by the Wuffs public\n // API. NULL means that the callee substitutes the implicit bounds derived\n // from buf.\n uint8_t* bounds[2];\n } private_impl;\n} wuffs_base__io_writer;\n\n// wuffs_base__io_buffer__compact moves any written but unread bytes to the\n// start of the buffer.\nstatic inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {\n if (!buf || (buf->ri == 0)) {\n return;\n }\n size_t n = buf->wi - buf->ri;\n if (n != 0) {\n memmove(buf->ptr, buf->ptr + buf->ri, n);\n }\n buf->wi = n;\n buf->ri = 0;\n}\n\nstatic inline wuffs_base__io_reader wuffs_base__io_buffer__reader(\n wuffs_base__io_buffer* buf) {\n wuffs_base__io_reader ret = ((wuffs_base__io_reader){});\n ret.private_impl.buf = buf;\n return ret;\n}\n\nstatic inline wuffs_base__io_writer wuffs_base__io_buffer__writer(\n wuffs_base__io_buffer* buf) {\n wuffs_base__io" +
|
||||
"_writer ret = ((wuffs_base__io_writer){});\n ret.private_impl.buf = buf;\n return ret;\n}\n\n" +
|
||||
"" +
|
||||
"// ---------------- Images\n\n// wuffs_base__color_u32argb is an 8 bit per channel Alpha, Red, Green, Blue\n// color, as a uint32_t value. It is in word order, not byte order: its value\n// is always 0xAARRGGBB, regardless of endianness. It uses premultiplied alpha.\ntypedef uint32_t wuffs_base__color_u32argb;\n\n" +
|
||||
"" +
|
||||
|
||||
+20
-14
@@ -78,30 +78,30 @@ static const char* decode() {
|
||||
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = src_buffer, .len = SRC_BUFFER_SIZE});
|
||||
|
||||
while (true) {
|
||||
const int stdin_fd = 0;
|
||||
ssize_t n_src = read(stdin_fd, src_buffer, SRC_BUFFER_SIZE);
|
||||
if (n_src < 0) {
|
||||
ssize_t n = read(stdin_fd, src.ptr + src.wi, src.len - src.wi);
|
||||
if (n < 0) {
|
||||
if (errno != EINTR) {
|
||||
return strerror(errno);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
|
||||
.ptr = src_buffer,
|
||||
.len = SRC_BUFFER_SIZE,
|
||||
.wi = n_src,
|
||||
.closed = n_src == 0,
|
||||
});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
src.wi += n;
|
||||
if (n == 0) {
|
||||
src.closed = true;
|
||||
}
|
||||
|
||||
while (true) {
|
||||
wuffs_base__io_buffer dst =
|
||||
((wuffs_base__io_buffer){.ptr = dst_buffer, .len = DST_BUFFER_SIZE});
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst);
|
||||
|
||||
wuffs_base__status s =
|
||||
wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader);
|
||||
wuffs_gzip__decoder__decode(&dec, wuffs_base__io_buffer__writer(&dst),
|
||||
wuffs_base__io_buffer__reader(&src));
|
||||
|
||||
if (dst.wi) {
|
||||
// TODO: handle EINTR and other write errors; see "man 2 write".
|
||||
@@ -115,9 +115,15 @@ static const char* decode() {
|
||||
if (s == WUFFS_BASE__SUSPENSION_SHORT_READ) {
|
||||
break;
|
||||
}
|
||||
if (s != WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
return wuffs_gzip__status__string(s);
|
||||
if (s == WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
continue;
|
||||
}
|
||||
return wuffs_gzip__status__string(s);
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer__compact(&src);
|
||||
if (src.wi == src.len) {
|
||||
return "internal error: no I/O progress possible";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -718,6 +718,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
@@ -707,6 +707,20 @@ typedef struct {
|
||||
} private_impl;
|
||||
} wuffs_base__io_writer;
|
||||
|
||||
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
|
||||
// start of the buffer.
|
||||
static inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
|
||||
if (!buf || (buf->ri == 0)) {
|
||||
return;
|
||||
}
|
||||
size_t n = buf->wi - buf->ri;
|
||||
if (n != 0) {
|
||||
memmove(buf->ptr, buf->ptr + buf->ri, n);
|
||||
}
|
||||
buf->wi = n;
|
||||
buf->ri = 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_reader wuffs_base__io_buffer__reader(
|
||||
wuffs_base__io_buffer* buf) {
|
||||
wuffs_base__io_reader ret = ((wuffs_base__io_reader){});
|
||||
|
||||
Reference in new issue
Block a user