Collapse trivial io_{reader,writer} buffer field

This commit is contained in:
Nigel Tao committed 2019-07-06 16:47:47 +10:00
1 parent 56e6a4759a
commit f34d189236
7 files changed
+330 -538

No files matched your search

+2 -2
View File
@@ -172,7 +172,7 @@ wuffs_base__io_reader__set(wuffs_base__io_reader* o,
b->meta.pos = 0;
b->meta.closed = false;
o->private_impl.buf = b;
*o = b;
*ptr_iop_r = data.ptr;
*ptr_io1_r = data.ptr + data.len;
@@ -203,7 +203,7 @@ wuffs_base__io_writer__set(wuffs_base__io_writer* o,
b->meta.pos = 0;
b->meta.closed = false;
o->private_impl.buf = b;
*o = b;
*ptr_iop_w = data.ptr;
*ptr_io1_w = data.ptr + data.len;
+6 -27
View File
@@ -20,21 +20,8 @@
struct wuffs_base__io_buffer__struct;
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so.
struct {
struct wuffs_base__io_buffer__struct* buf;
} private_impl;
} wuffs_base__io_reader;
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so.
struct {
struct wuffs_base__io_buffer__struct* buf;
} private_impl;
} wuffs_base__io_writer;
typedef struct wuffs_base__io_buffer__struct* wuffs_base__io_reader;
typedef struct wuffs_base__io_buffer__struct* wuffs_base__io_writer;
// wuffs_base__io_buffer_meta is the metadata for a wuffs_base__io_buffer's
// data.
@@ -111,16 +98,12 @@ wuffs_base__null_io_buffer_meta() {
static inline wuffs_base__io_reader //
wuffs_base__null_io_reader() {
wuffs_base__io_reader ret;
ret.private_impl.buf = NULL;
return ret;
return NULL;
}
static inline wuffs_base__io_writer //
wuffs_base__null_io_writer() {
wuffs_base__io_writer ret;
ret.private_impl.buf = NULL;
return ret;
return NULL;
}
// wuffs_base__io_buffer__compact moves any written but unread bytes to the
@@ -141,16 +124,12 @@ wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
static inline wuffs_base__io_reader //
wuffs_base__io_buffer__reader(wuffs_base__io_buffer* buf) {
wuffs_base__io_reader ret;
ret.private_impl.buf = buf;
return ret;
return buf;
}
static inline wuffs_base__io_writer //
wuffs_base__io_buffer__writer(wuffs_base__io_buffer* buf) {
wuffs_base__io_writer ret;
ret.private_impl.buf = buf;
return ret;
return buf;
}
static inline uint64_t //