From 74614a2921de6ff89bf54036bff9dd4f0d486427 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 14 Sep 2019 12:06:27 +1000 Subject: [PATCH] Fix calls to the deprecated null_io_buffer --- internal/cgen/builtin.go | 2 +- internal/cgen/var.go | 2 +- release/c/wuffs-unsupported-snapshot.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index c360f3d2..0bfee537 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -100,7 +100,7 @@ func (g *gen) writeBuiltinCall(b *buffer, n *a.Expr, depth uint32) error { if !g.currFunk.usesEmptyIOBuffer { g.currFunk.usesEmptyIOBuffer = true g.currFunk.bPrologue.writes("wuffs_base__io_buffer empty_io_buffer = " + - "wuffs_base__null_io_buffer();\n\n") + "wuffs_base__empty_io_buffer();\n\n") } b.writes("&empty_io_buffer") return nil diff --git a/internal/cgen/var.go b/internal/cgen/var.go index 9263d1cf..46041890 100644 --- a/internal/cgen/var.go +++ b/internal/cgen/var.go @@ -274,7 +274,7 @@ func (g *gen) writeVars(b *buffer, f *funk, inStructDecl bool) error { name := n.Name().Str(g.tm) if typ.IsIOType() { - b.printf("wuffs_base__io_buffer %s%s = wuffs_base__null_io_buffer();\n", uPrefix, name) + b.printf("wuffs_base__io_buffer %s%s = wuffs_base__empty_io_buffer();\n", uPrefix, name) } if err := g.writeCTypeName(b, typ, vPrefix, name); err != nil { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 779802c5..761ff3f3 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -10814,7 +10814,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, bool v_need_block_size = false; uint64_t v_n_compressed = 0; wuffs_base__slice_u8 v_compressed = {0}; - wuffs_base__io_buffer u_r = wuffs_base__null_io_buffer(); + wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer(); wuffs_base__io_buffer* v_r = &u_r; uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; @@ -10836,7 +10836,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, io2_a_src = io0_a_src + a_src->meta.wi; } - wuffs_base__io_buffer empty_io_buffer = wuffs_base__null_io_buffer(); + wuffs_base__io_buffer empty_io_buffer = wuffs_base__empty_io_buffer(); uint32_t coro_susp_point = self->private_impl.p_decode_id_part2[0]; if (coro_susp_point) {