From 5407f39386ebd367a892f96228cc9d0b34d785a9 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 2 Nov 2023 22:43:01 +1100 Subject: [PATCH] base: use wuffs_base__empty_slice_u8 more often --- example/gifplayer/gifplayer.c | 6 +++--- internal/cgen/base/fundamental-private.h | 4 ++-- internal/cgen/base/fundamental-public.h | 6 +++--- internal/cgen/base/image-public.h | 2 +- internal/cgen/base/io-private.h | 2 +- internal/cgen/base/memory-public.h | 8 ++++---- internal/cgen/func.go | 2 +- release/c/wuffs-unsupported-snapshot.c | 26 ++++++++++++------------ 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index 9de06058..5f1538df 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -305,7 +305,7 @@ try_allocate(wuffs_gif__decoder* dec) { return "could not allocate work buffer"; } } else { - g_workbuf = wuffs_base__make_slice_u8(NULL, 0); + g_workbuf = wuffs_base__empty_slice_u8(); } uint64_t plen = 1 + ((uint64_t)(width) + 1) * (uint64_t)(height); @@ -326,9 +326,9 @@ allocate(wuffs_gif__decoder* dec) { const char* status_msg = try_allocate(dec); if (status_msg) { free(g_printbuf.ptr); - g_printbuf = wuffs_base__make_slice_u8(NULL, 0); + g_printbuf = wuffs_base__empty_slice_u8(); free(g_workbuf.ptr); - g_workbuf = wuffs_base__make_slice_u8(NULL, 0); + g_workbuf = wuffs_base__empty_slice_u8(); free(g_prev_dst_buffer); g_prev_dst_buffer = NULL; free(g_curr_dst_buffer); diff --git a/internal/cgen/base/fundamental-private.h b/internal/cgen/base/fundamental-private.h index fcece1b3..a7529df2 100644 --- a/internal/cgen/base/fundamental-private.h +++ b/internal/cgen/base/fundamental-private.h @@ -215,7 +215,7 @@ wuffs_private_impl__slice_u8__suffix(wuffs_base__slice_u8 s, uint64_t up_to) { // slice) is valid and results in a no-op. static inline uint64_t // wuffs_private_impl__slice_u8__copy_from_slice(wuffs_base__slice_u8 dst, - wuffs_base__slice_u8 src) { + wuffs_base__slice_u8 src) { size_t len = dst.len < src.len ? dst.len : src.len; if (len > 0) { memmove(dst.ptr, src.ptr, len); @@ -258,7 +258,7 @@ wuffs_private_impl__table_u8__row_u32(wuffs_base__table_u8 t, uint32_t y) { if (y < t.height) { return wuffs_base__make_slice_u8(t.ptr + (t.stride * y), t.width); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } // ---------------- Slices and Tables (Utility) diff --git a/internal/cgen/base/fundamental-public.h b/internal/cgen/base/fundamental-public.h index 95fe4615..d7ff5bdf 100644 --- a/internal/cgen/base/fundamental-public.h +++ b/internal/cgen/base/fundamental-public.h @@ -1506,7 +1506,7 @@ wuffs_base__slice_u8__subslice_i(wuffs_base__slice_u8 s, uint64_t i) { if ((i <= SIZE_MAX) && (i <= s.len)) { return wuffs_base__make_slice_u8(s.ptr + i, ((size_t)(s.len - i))); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } // wuffs_base__slice_u8__subslice_j returns s[:j]. @@ -1517,7 +1517,7 @@ wuffs_base__slice_u8__subslice_j(wuffs_base__slice_u8 s, uint64_t j) { if ((j <= SIZE_MAX) && (j <= s.len)) { return wuffs_base__make_slice_u8(s.ptr, ((size_t)j)); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } // wuffs_base__slice_u8__subslice_ij returns s[i:j]. @@ -1530,7 +1530,7 @@ wuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s, if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) { return wuffs_base__make_slice_u8(s.ptr + i, ((size_t)(j - i))); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } // wuffs_base__table_u8__subtable_ij returns t[ix:jx, iy:jy]. diff --git a/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h index c2230c37..9fb72945 100644 --- a/internal/cgen/base/image-public.h +++ b/internal/cgen/base/image-public.h @@ -1352,7 +1352,7 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* pb) { tab->ptr, WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH); } } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } static inline wuffs_base__slice_u8 // diff --git a/internal/cgen/base/io-private.h b/internal/cgen/base/io-private.h index 6746f303..2aad2fbd 100644 --- a/internal/cgen/base/io-private.h +++ b/internal/cgen/base/io-private.h @@ -32,7 +32,7 @@ wuffs_private_impl__io__since(uint64_t mark, return wuffs_base__make_slice_u8(((uint8_t*)ptr) + mark, ((size_t)(index - mark))); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } #if defined(__GNUC__) #pragma GCC diagnostic pop diff --git a/internal/cgen/base/memory-public.h b/internal/cgen/base/memory-public.h index bef9cf8d..b880f123 100644 --- a/internal/cgen/base/memory-public.h +++ b/internal/cgen/base/memory-public.h @@ -31,7 +31,7 @@ wuffs_base__malloc_slice_u8(void* (*malloc_func)(size_t), uint64_t num_u8) { return wuffs_base__make_slice_u8((uint8_t*)(p), (size_t)num_u8); } } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } static inline wuffs_base__slice_u16 // @@ -42,7 +42,7 @@ wuffs_base__malloc_slice_u16(void* (*malloc_func)(size_t), uint64_t num_u16) { return wuffs_base__make_slice_u16((uint16_t*)(p), (size_t)num_u16); } } - return wuffs_base__make_slice_u16(NULL, 0); + return wuffs_base__empty_slice_u16(); } static inline wuffs_base__slice_u32 // @@ -53,7 +53,7 @@ wuffs_base__malloc_slice_u32(void* (*malloc_func)(size_t), uint64_t num_u32) { return wuffs_base__make_slice_u32((uint32_t*)(p), (size_t)num_u32); } } - return wuffs_base__make_slice_u32(NULL, 0); + return wuffs_base__empty_slice_u32(); } static inline wuffs_base__slice_u64 // @@ -64,5 +64,5 @@ wuffs_base__malloc_slice_u64(void* (*malloc_func)(size_t), uint64_t num_u64) { return wuffs_base__make_slice_u64((uint64_t*)(p), (size_t)num_u64); } } - return wuffs_base__make_slice_u64(NULL, 0); + return wuffs_base__empty_slice_u64(); } diff --git a/internal/cgen/func.go b/internal/cgen/func.go index 1da30511..57f3b37b 100644 --- a/internal/cgen/func.go +++ b/internal/cgen/func.go @@ -343,7 +343,7 @@ func writeOutParamZeroValue(b *buffer, tm *t.Map, typ *a.TypeExpr) error { return nil } else if typ.IsEitherSliceType() { if inner := typ.Inner(); (inner.Decorator() == 0) && (inner.QID() == t.QID{t.IDBase, t.IDU8}) { - b.writes("wuffs_base__make_slice_u8(NULL, 0)") + b.writes("wuffs_base__empty_slice_u8()") return nil } } else if (typ.Decorator() == 0) && (typ.QID()[0] == t.IDBase) { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 2f9aca74..9a5ff4ec 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -1777,7 +1777,7 @@ wuffs_base__slice_u8__subslice_i(wuffs_base__slice_u8 s, uint64_t i) { if ((i <= SIZE_MAX) && (i <= s.len)) { return wuffs_base__make_slice_u8(s.ptr + i, ((size_t)(s.len - i))); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } // wuffs_base__slice_u8__subslice_j returns s[:j]. @@ -1788,7 +1788,7 @@ wuffs_base__slice_u8__subslice_j(wuffs_base__slice_u8 s, uint64_t j) { if ((j <= SIZE_MAX) && (j <= s.len)) { return wuffs_base__make_slice_u8(s.ptr, ((size_t)j)); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } // wuffs_base__slice_u8__subslice_ij returns s[i:j]. @@ -1801,7 +1801,7 @@ wuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s, if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) { return wuffs_base__make_slice_u8(s.ptr + i, ((size_t)(j - i))); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } // wuffs_base__table_u8__subtable_ij returns t[ix:jx, iy:jy]. @@ -3844,7 +3844,7 @@ wuffs_base__malloc_slice_u8(void* (*malloc_func)(size_t), uint64_t num_u8) { return wuffs_base__make_slice_u8((uint8_t*)(p), (size_t)num_u8); } } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } static inline wuffs_base__slice_u16 // @@ -3855,7 +3855,7 @@ wuffs_base__malloc_slice_u16(void* (*malloc_func)(size_t), uint64_t num_u16) { return wuffs_base__make_slice_u16((uint16_t*)(p), (size_t)num_u16); } } - return wuffs_base__make_slice_u16(NULL, 0); + return wuffs_base__empty_slice_u16(); } static inline wuffs_base__slice_u32 // @@ -3866,7 +3866,7 @@ wuffs_base__malloc_slice_u32(void* (*malloc_func)(size_t), uint64_t num_u32) { return wuffs_base__make_slice_u32((uint32_t*)(p), (size_t)num_u32); } } - return wuffs_base__make_slice_u32(NULL, 0); + return wuffs_base__empty_slice_u32(); } static inline wuffs_base__slice_u64 // @@ -3877,7 +3877,7 @@ wuffs_base__malloc_slice_u64(void* (*malloc_func)(size_t), uint64_t num_u64) { return wuffs_base__make_slice_u64((uint64_t*)(p), (size_t)num_u64); } } - return wuffs_base__make_slice_u64(NULL, 0); + return wuffs_base__empty_slice_u64(); } // ---------------- Images @@ -5224,7 +5224,7 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* pb) { tab->ptr, WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH); } } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } static inline wuffs_base__slice_u8 // @@ -14447,7 +14447,7 @@ wuffs_private_impl__slice_u8__suffix(wuffs_base__slice_u8 s, uint64_t up_to) { // slice) is valid and results in a no-op. static inline uint64_t // wuffs_private_impl__slice_u8__copy_from_slice(wuffs_base__slice_u8 dst, - wuffs_base__slice_u8 src) { + wuffs_base__slice_u8 src) { size_t len = dst.len < src.len ? dst.len : src.len; if (len > 0) { memmove(dst.ptr, src.ptr, len); @@ -14490,7 +14490,7 @@ wuffs_private_impl__table_u8__row_u32(wuffs_base__table_u8 t, uint32_t y) { if (y < t.height) { return wuffs_base__make_slice_u8(t.ptr + (t.stride * y), t.width); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } // ---------------- Slices and Tables (Utility) @@ -14586,7 +14586,7 @@ wuffs_private_impl__io__since(uint64_t mark, return wuffs_base__make_slice_u8(((uint8_t*)ptr) + mark, ((size_t)(index - mark))); } - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } #if defined(__GNUC__) #pragma GCC diagnostic pop @@ -50931,10 +50931,10 @@ WUFFS_BASE__MAYBE_STATIC wuffs_base__slice_u8 wuffs_lzw__decoder__flush( wuffs_lzw__decoder* self) { if (!self) { - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - return wuffs_base__make_slice_u8(NULL, 0); + return wuffs_base__empty_slice_u8(); } uint32_t v_ri = 0;