Simplify wuffs_base__io_{reader,writer}__set

This commit is contained in:
Nigel Tao committed 2019-07-07 17:19:23 +10:00
1 parent 2b40cf00c4
commit 5653fb0409
4 files changed
+18 -34

No files matched your search

+8 -16
View File
@@ -4610,9 +4610,8 @@ wuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_iop_w,
return (uint32_t)(n);
}
static inline wuffs_base__empty_struct //
wuffs_base__io_reader__set(wuffs_base__io_buffer** o,
wuffs_base__io_buffer* b,
static inline wuffs_base__io_buffer* //
wuffs_base__io_reader__set(wuffs_base__io_buffer* b,
uint8_t** ptr_iop_r,
uint8_t** ptr_io0_r,
uint8_t** ptr_io1_r,
@@ -4624,15 +4623,12 @@ wuffs_base__io_reader__set(wuffs_base__io_buffer** o,
b->meta.pos = 0;
b->meta.closed = false;
*o = b;
*ptr_iop_r = data.ptr;
*ptr_io0_r = data.ptr;
*ptr_io1_r = data.ptr;
*ptr_io2_r = data.ptr + data.len;
wuffs_base__empty_struct ret;
ret.private_impl = 0;
return ret;
return b;
}
static inline wuffs_base__slice_u8 //
@@ -4645,9 +4641,8 @@ wuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) {
return wuffs_base__make_slice_u8(NULL, 0);
}
static inline wuffs_base__empty_struct //
wuffs_base__io_writer__set(wuffs_base__io_buffer** o,
wuffs_base__io_buffer* b,
static inline wuffs_base__io_buffer* //
wuffs_base__io_writer__set(wuffs_base__io_buffer* b,
uint8_t** ptr_iop_w,
uint8_t** ptr_io0_w,
uint8_t** ptr_io1_w,
@@ -4659,15 +4654,12 @@ wuffs_base__io_writer__set(wuffs_base__io_buffer** o,
b->meta.pos = 0;
b->meta.closed = false;
*o = b;
*ptr_iop_w = data.ptr;
*ptr_io0_w = data.ptr;
*ptr_io1_w = data.ptr;
*ptr_io2_w = data.ptr + data.len;
wuffs_base__empty_struct ret;
ret.private_impl = 0;
return ret;
return b;
}
// ---------------- I/O (Utility)
@@ -10896,8 +10888,8 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self,
uint8_t* o_0_io0_v_r = io0_v_r;
uint8_t* o_0_io1_v_r = io1_v_r;
uint8_t* o_0_io2_v_r = io2_v_r;
wuffs_base__io_reader__set(
&v_r, &u_r, &iop_v_r, &io0_v_r, &io1_v_r, &io2_v_r,
v_r = wuffs_base__io_reader__set(
&u_r, &iop_v_r, &io0_v_r, &io1_v_r, &io2_v_r,
wuffs_base__slice_u8__subslice_ij(
wuffs_base__make_slice_u8(self->private_data.f_compressed,
4096),