Remove the cgen receiver for base.utility methods
diff --git a/cmd/wuffs-c/internal/cgen/base/core-public.h b/cmd/wuffs-c/internal/cgen/base/core-public.h
index fe5753e..8cdd704 100644
--- a/cmd/wuffs-c/internal/cgen/base/core-public.h
+++ b/cmd/wuffs-c/internal/cgen/base/core-public.h
@@ -345,7 +345,7 @@
// ---------------- Slices and Tables (Utility)
static inline wuffs_base__slice_u8 //
-wuffs_base__utility__null_slice_u8(const wuffs_base__utility* ignored) {
+wuffs_base__utility__null_slice_u8() {
return ((wuffs_base__slice_u8){});
}
diff --git a/cmd/wuffs-c/internal/cgen/base/io-private.h b/cmd/wuffs-c/internal/cgen/base/io-private.h
index af2ee92..e532381 100644
--- a/cmd/wuffs-c/internal/cgen/base/io-private.h
+++ b/cmd/wuffs-c/internal/cgen/base/io-private.h
@@ -266,12 +266,12 @@
// ---------------- I/O (Utility)
static inline wuffs_base__io_reader //
-wuffs_base__utility__null_io_reader(const wuffs_base__utility* ignored) {
+wuffs_base__utility__null_io_reader() {
return ((wuffs_base__io_reader){});
}
static inline wuffs_base__io_writer //
-wuffs_base__utility__null_io_writer(const wuffs_base__utility* ignored) {
+wuffs_base__utility__null_io_writer() {
return ((wuffs_base__io_writer){});
}
diff --git a/cmd/wuffs-c/internal/cgen/base/range-private.h b/cmd/wuffs-c/internal/cgen/base/range-private.h
index cd77698..5cb6927 100644
--- a/cmd/wuffs-c/internal/cgen/base/range-private.h
+++ b/cmd/wuffs-c/internal/cgen/base/range-private.h
@@ -59,9 +59,7 @@
// ---------------- Ranges and Rects (Utility)
static inline wuffs_base__range_ii_u32 //
-wuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored,
- uint32_t min_incl,
- uint32_t max_incl) {
+wuffs_base__utility__make_range_ii_u32(uint32_t min_incl, uint32_t max_incl) {
return ((wuffs_base__range_ii_u32){
.min_incl = min_incl,
.max_incl = max_incl,
@@ -69,9 +67,7 @@
}
static inline wuffs_base__range_ie_u32 //
-wuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored,
- uint32_t min_incl,
- uint32_t max_excl) {
+wuffs_base__utility__make_range_ie_u32(uint32_t min_incl, uint32_t max_excl) {
return ((wuffs_base__range_ie_u32){
.min_incl = min_incl,
.max_excl = max_excl,
@@ -79,9 +75,7 @@
}
static inline wuffs_base__range_ii_u64 //
-wuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored,
- uint64_t min_incl,
- uint64_t max_incl) {
+wuffs_base__utility__make_range_ii_u64(uint64_t min_incl, uint64_t max_incl) {
return ((wuffs_base__range_ii_u64){
.min_incl = min_incl,
.max_incl = max_incl,
@@ -89,9 +83,7 @@
}
static inline wuffs_base__range_ie_u64 //
-wuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored,
- uint64_t min_incl,
- uint64_t max_excl) {
+wuffs_base__utility__make_range_ie_u64(uint64_t min_incl, uint64_t max_excl) {
return ((wuffs_base__range_ie_u64){
.min_incl = min_incl,
.max_excl = max_excl,
@@ -99,8 +91,7 @@
}
static inline wuffs_base__rect_ii_u32 //
-wuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored,
- uint32_t min_incl_x,
+wuffs_base__utility__make_rect_ii_u32(uint32_t min_incl_x,
uint32_t min_incl_y,
uint32_t max_incl_x,
uint32_t max_incl_y) {
@@ -113,8 +104,7 @@
}
static inline wuffs_base__rect_ie_u32 //
-wuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored,
- uint32_t min_incl_x,
+wuffs_base__utility__make_rect_ie_u32(uint32_t min_incl_x,
uint32_t min_incl_y,
uint32_t max_excl_x,
uint32_t max_excl_y) {
diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go
index 99053dc..5264aa8 100644
--- a/cmd/wuffs-c/internal/cgen/cgen.go
+++ b/cmd/wuffs-c/internal/cgen/cgen.go
@@ -44,6 +44,8 @@
sixtyFour = big.NewInt(64)
mibi = big.NewInt(1 << 20)
+
+ typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil)
)
// Prefixes are prepended to names to form a namespace and to avoid e.g.
diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go
index a10a8ca..b1f45cf 100644
--- a/cmd/wuffs-c/internal/cgen/data.go
+++ b/cmd/wuffs-c/internal/cgen/data.go
@@ -78,7 +78,7 @@
"int8_t) wuffs_base__table_u8;\ntypedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16;\ntypedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32;\ntypedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64;\n\n// wuffs_base__slice_u8__subslice_i returns s[i:].\n//\n// It returns an empty slice if i is out of bounds.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__slice_u8__subslice_i(wuffs_base__slice_u8 s, uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__subslice_j returns s[:j].\n//\n// It returns an empty slice if j is out of bounds.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__slice_u8__subslice_j(wuffs_base__slice_u8 s, uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr,\n .len = j,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__subslice_" +
"ij returns s[i:j].\n//\n// It returns an empty slice if i or j is out of bounds.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n" +
"" +
- "// ---------------- Slices and Tables (Utility)\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__utility__null_slice_u8(const wuffs_base__utility* ignored) {\n return ((wuffs_base__slice_u8){});\n}\n\n" +
+ "// ---------------- Slices and Tables (Utility)\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__utility__null_slice_u8() {\n return ((wuffs_base__slice_u8){});\n}\n\n" +
"" +
"// ---------------- Bureaucracy re -Wunused-function\n\nstatic inline void\nwuffs_base__acknowledge_potentially_unused_functions__core_public()\n WUFFS_BASE__POTENTIALLY_UNUSED;\n\nstatic inline void\nwuffs_base__acknowledge_potentially_unused_functions__core_public() {\n (void)(wuffs_base__slice_u8__subslice_i);\n (void)(wuffs_base__slice_u8__subslice_ij);\n (void)(wuffs_base__slice_u8__subslice_j);\n (void)(wuffs_base__status__is_complete);\n (void)(wuffs_base__status__is_error);\n (void)(wuffs_base__status__is_ok);\n (void)(wuffs_base__status__is_suspension);\n (void)(wuffs_base__status__is_warning);\n (void)(wuffs_base__u16__max);\n (void)(wuffs_base__u16__min);\n (void)(wuffs_base__u16__sat_add);\n (void)(wuffs_base__u16__sat_sub);\n (void)(wuffs_base__u32__max);\n (void)(wuffs_base__u32__min);\n (void)(wuffs_base__u32__sat_add);\n (void)(wuffs_base__u32__sat_sub);\n (void)(wuffs_base__u64__max);\n (void)(wuffs_base__u64__min);\n (void)(wuffs_base__u64__sat_add);\n (void)(wuffs_base__u64__sat_sub);\n (void)(" +
"wuffs_base__u8__max);\n (void)(wuffs_base__u8__min);\n (void)(wuffs_base__u8__sat_add);\n (void)(wuffs_base__u8__sat_sub);\n (void)(wuffs_base__utility__null_slice_u8);\n}\n" +
@@ -169,7 +169,7 @@
"data;\n b->meta.wi = data.len;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n o->private_impl.buf = b;\n o->private_impl.mark = data.ptr;\n o->private_impl.limit = data.ptr + data.len;\n *ptr_iop_r = data.ptr;\n *ptr_io1_r = data.ptr + data.len;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_reader__set_limit(wuffs_base__io_reader* o,\n uint8_t* iop_r,\n uint64_t limit) {\n if (o && (((size_t)(o->private_impl.limit - iop_r)) > limit)) {\n o->private_impl.limit = iop_r + limit;\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_reader__set_mark(wuffs_base__io_reader* o, uint8_t* mark) {\n o->private_impl.mark = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io1_r, uint64_t n) {\n if (n <= ((size_t)(io1_r - *ptr_iop_r))) {\n" +
" uint8_t* p = *ptr_iop_r;\n *ptr_iop_r += n;\n return ((wuffs_base__slice_u8){\n .ptr = p,\n .len = n,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_writer__set(wuffs_base__io_writer* o,\n wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_w,\n uint8_t** ptr_io1_w,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = 0;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n o->private_impl.buf = b;\n o->private_impl.mark = data.ptr;\n o->private_impl.limit = data.ptr + data.len;\n *ptr_iop_w = data.ptr;\n *ptr_io1_w = data.ptr + data.len;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_writer__set_mark(wuffs_base__io_writer* o, uint8_t* mark) {\n o->private_impl.mark = mark;\n return ((wuffs_base__empty_struct){});\n}\n\n" +
"" +
- "// ---------------- I/O (Utility)\n\nstatic inline wuffs_base__io_reader //\nwuffs_base__utility__null_io_reader(const wuffs_base__utility* ignored) {\n return ((wuffs_base__io_reader){});\n}\n\nstatic inline wuffs_base__io_writer //\nwuffs_base__utility__null_io_writer(const wuffs_base__utility* ignored) {\n return ((wuffs_base__io_writer){});\n}\n\n" +
+ "// ---------------- I/O (Utility)\n\nstatic inline wuffs_base__io_reader //\nwuffs_base__utility__null_io_reader() {\n return ((wuffs_base__io_reader){});\n}\n\nstatic inline wuffs_base__io_writer //\nwuffs_base__utility__null_io_writer() {\n return ((wuffs_base__io_writer){});\n}\n\n" +
"" +
"// ---------------- Bureaucracy re -Wunused-function\n\nstatic inline void\nwuffs_base__acknowledge_potentially_unused_functions__io_private()\n WUFFS_BASE__POTENTIALLY_UNUSED;\n\nstatic inline void\nwuffs_base__acknowledge_potentially_unused_functions__io_private() {\n (void)(wuffs_base__io_buffer__is_valid);\n (void)(wuffs_base__io_reader__is_eof);\n (void)(wuffs_base__io_reader__is_valid);\n (void)(wuffs_base__io_reader__set);\n (void)(wuffs_base__io_reader__set_limit);\n (void)(wuffs_base__io_reader__set_mark);\n (void)(wuffs_base__io_reader__take);\n (void)(wuffs_base__io_writer__copy_from_slice);\n (void)(wuffs_base__io_writer__copy_n_from_history);\n (void)(wuffs_base__io_writer__copy_n_from_history_fast);\n (void)(wuffs_base__io_writer__copy_n_from_reader);\n (void)(wuffs_base__io_writer__copy_n_from_slice);\n (void)(wuffs_base__io_writer__is_valid);\n (void)(wuffs_base__io_writer__set);\n (void)(wuffs_base__io_writer__set_mark);\n (void)(wuffs_base__utility__null_io_reader);\n (void)(wuffs_base__utility_" +
"_null_io_writer);\n}\n" +
@@ -188,9 +188,8 @@
"// ---------------- Ranges and Rects\n\nstatic inline uint32_t //\nwuffs_base__range_ii_u32__get_min_incl(const wuffs_base__range_ii_u32* r) {\n return r->min_incl;\n}\n\nstatic inline uint32_t //\nwuffs_base__range_ii_u32__get_max_incl(const wuffs_base__range_ii_u32* r) {\n return r->max_incl;\n}\n\nstatic inline uint32_t //\nwuffs_base__range_ie_u32__get_min_incl(const wuffs_base__range_ie_u32* r) {\n return r->min_incl;\n}\n\nstatic inline uint32_t //\nwuffs_base__range_ie_u32__get_max_excl(const wuffs_base__range_ie_u32* r) {\n return r->max_excl;\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ii_u64__get_min_incl(const wuffs_base__range_ii_u64* r) {\n return r->min_incl;\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ii_u64__get_max_incl(const wuffs_base__range_ii_u64* r) {\n return r->max_incl;\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ie_u64__get_min_incl(const wuffs_base__range_ie_u64* r) {\n return r->min_incl;\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ie_u64__get_max_excl(const wuffs_base__range_" +
"ie_u64* r) {\n return r->max_excl;\n}\n\n" +
"" +
- "// ---------------- Ranges and Rects (Utility)\n\nstatic inline wuffs_base__range_ii_u32 //\nwuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_incl) {\n return ((wuffs_base__range_ii_u32){\n .min_incl = min_incl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u32 //\nwuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_excl) {\n return ((wuffs_base__range_ie_u32){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_incl) {\n return ((wuffs_base__range_ii_u64){\n .min_incl = min_in" +
- "cl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u64 //\nwuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_excl) {\n return ((wuffs_base__range_ie_u64){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__rect_ii_u32 //\nwuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_incl_x,\n uint32_t max_incl_y) {\n return ((wuffs_base__rect_ii_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_incl_x = max_incl_x,\n .max_incl_y = max_incl_y,\n });\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored,\n" +
- " uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_excl_x,\n uint32_t max_excl_y) {\n return ((wuffs_base__rect_ie_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_excl_x = max_excl_x,\n .max_excl_y = max_excl_y,\n });\n}\n\n" +
+ "// ---------------- Ranges and Rects (Utility)\n\nstatic inline wuffs_base__range_ii_u32 //\nwuffs_base__utility__make_range_ii_u32(uint32_t min_incl, uint32_t max_incl) {\n return ((wuffs_base__range_ii_u32){\n .min_incl = min_incl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u32 //\nwuffs_base__utility__make_range_ie_u32(uint32_t min_incl, uint32_t max_excl) {\n return ((wuffs_base__range_ie_u32){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__utility__make_range_ii_u64(uint64_t min_incl, uint64_t max_incl) {\n return ((wuffs_base__range_ii_u64){\n .min_incl = min_incl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u64 //\nwuffs_base__utility__make_range_ie_u64(uint64_t min_incl, uint64_t max_excl) {\n return ((wuffs_base__range_ie_u64){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__rect_ii_u32 //\nwuffs_base__utility__make_rect_ii_" +
+ "u32(uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_incl_x,\n uint32_t max_incl_y) {\n return ((wuffs_base__rect_ii_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_incl_x = max_incl_x,\n .max_incl_y = max_incl_y,\n });\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__utility__make_rect_ie_u32(uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_excl_x,\n uint32_t max_excl_y) {\n return ((wuffs_base__rect_ie_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_excl_x = max_excl_x,\n .max_excl_y = max_excl_y,\n });\n}\n\n" +
"" +
"// ---------------- Bureaucracy re -Wunused-function\n\nstatic inline void\nwuffs_base__acknowledge_potentially_unused_functions__range_private()\n WUFFS_BASE__POTENTIALLY_UNUSED;\n\nstatic inline void\nwuffs_base__acknowledge_potentially_unused_functions__range_private() {\n (void)(wuffs_base__range_ie_u32__get_max_excl);\n (void)(wuffs_base__range_ie_u32__get_min_incl);\n (void)(wuffs_base__range_ie_u64__get_max_excl);\n (void)(wuffs_base__range_ie_u64__get_min_incl);\n (void)(wuffs_base__range_ii_u32__get_max_incl);\n (void)(wuffs_base__range_ii_u32__get_min_incl);\n (void)(wuffs_base__range_ii_u64__get_max_incl);\n (void)(wuffs_base__range_ii_u64__get_min_incl);\n (void)(wuffs_base__utility__make_range_ie_u32);\n (void)(wuffs_base__utility__make_range_ie_u64);\n (void)(wuffs_base__utility__make_range_ii_u32);\n (void)(wuffs_base__utility__make_range_ii_u64);\n (void)(wuffs_base__utility__make_rect_ie_u32);\n (void)(wuffs_base__utility__make_rect_ii_u32);\n}\n" +
""
diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go
index a43586c..fcf5804 100644
--- a/cmd/wuffs-c/internal/cgen/expr.go
+++ b/cmd/wuffs-c/internal/cgen/expr.go
@@ -319,12 +319,15 @@
n.Str(g.tm), recv.MType().Str(g.tm))
}
qid := recvTyp.QID()
- b.printf("%s%s__%s(%s", g.packagePrefix(qid), qid[1].Str(g.tm), method.Ident().Str(g.tm), addr)
- if err := g.writeExpr(b, recv, depth); err != nil {
- return err
- }
- if len(n.Args()) > 0 {
- b.writeb(',')
+ b.printf("%s%s__%s(", g.packagePrefix(qid), qid[1].Str(g.tm), method.Ident().Str(g.tm))
+ if !recvTyp.Eq(typeExprUtility) {
+ b.writes(addr)
+ if err := g.writeExpr(b, recv, depth); err != nil {
+ return err
+ }
+ if len(n.Args()) > 0 {
+ b.writeb(',')
+ }
}
return g.writeArgs(b, n.Args(), depth)
}
diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c
index 943be14..6f17b78 100644
--- a/release/c/wuffs-unsupported-snapshot.c
+++ b/release/c/wuffs-unsupported-snapshot.c
@@ -376,7 +376,7 @@
// ---------------- Slices and Tables (Utility)
static inline wuffs_base__slice_u8 //
-wuffs_base__utility__null_slice_u8(const wuffs_base__utility* ignored) {
+wuffs_base__utility__null_slice_u8() {
return ((wuffs_base__slice_u8){});
}
@@ -4104,9 +4104,7 @@
// ---------------- Ranges and Rects (Utility)
static inline wuffs_base__range_ii_u32 //
-wuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored,
- uint32_t min_incl,
- uint32_t max_incl) {
+wuffs_base__utility__make_range_ii_u32(uint32_t min_incl, uint32_t max_incl) {
return ((wuffs_base__range_ii_u32){
.min_incl = min_incl,
.max_incl = max_incl,
@@ -4114,9 +4112,7 @@
}
static inline wuffs_base__range_ie_u32 //
-wuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored,
- uint32_t min_incl,
- uint32_t max_excl) {
+wuffs_base__utility__make_range_ie_u32(uint32_t min_incl, uint32_t max_excl) {
return ((wuffs_base__range_ie_u32){
.min_incl = min_incl,
.max_excl = max_excl,
@@ -4124,9 +4120,7 @@
}
static inline wuffs_base__range_ii_u64 //
-wuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored,
- uint64_t min_incl,
- uint64_t max_incl) {
+wuffs_base__utility__make_range_ii_u64(uint64_t min_incl, uint64_t max_incl) {
return ((wuffs_base__range_ii_u64){
.min_incl = min_incl,
.max_incl = max_incl,
@@ -4134,9 +4128,7 @@
}
static inline wuffs_base__range_ie_u64 //
-wuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored,
- uint64_t min_incl,
- uint64_t max_excl) {
+wuffs_base__utility__make_range_ie_u64(uint64_t min_incl, uint64_t max_excl) {
return ((wuffs_base__range_ie_u64){
.min_incl = min_incl,
.max_excl = max_excl,
@@ -4144,8 +4136,7 @@
}
static inline wuffs_base__rect_ii_u32 //
-wuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored,
- uint32_t min_incl_x,
+wuffs_base__utility__make_rect_ii_u32(uint32_t min_incl_x,
uint32_t min_incl_y,
uint32_t max_incl_x,
uint32_t max_incl_y) {
@@ -4158,8 +4149,7 @@
}
static inline wuffs_base__rect_ie_u32 //
-wuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored,
- uint32_t min_incl_x,
+wuffs_base__utility__make_rect_ie_u32(uint32_t min_incl_x,
uint32_t min_incl_y,
uint32_t max_excl_x,
uint32_t max_excl_y) {
@@ -4447,12 +4437,12 @@
// ---------------- I/O (Utility)
static inline wuffs_base__io_reader //
-wuffs_base__utility__null_io_reader(const wuffs_base__utility* ignored) {
+wuffs_base__utility__null_io_reader() {
return ((wuffs_base__io_reader){});
}
static inline wuffs_base__io_writer //
-wuffs_base__utility__null_io_writer(const wuffs_base__utility* ignored) {
+wuffs_base__utility__null_io_writer() {
return ((wuffs_base__io_writer){});
}
@@ -6021,8 +6011,7 @@
return ((wuffs_base__range_ii_u64){});
}
- return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util,
- 33280, 33280);
+ return wuffs_base__utility__make_range_ii_u64(33280, 33280);
}
// -------- func deflate.decoder.decode_io_writer
@@ -7820,8 +7809,7 @@
return ((wuffs_base__range_ii_u64){});
}
- return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util, 0,
- 0);
+ return wuffs_base__utility__make_range_ii_u64(0, 0);
}
// -------- func lzw.decoder.decode_io_writer
@@ -8507,7 +8495,7 @@
}
return wuffs_base__utility__make_rect_ie_u32(
- &self->private_impl.f_util, self->private_impl.f_frame_rect_x0,
+ self->private_impl.f_frame_rect_x0,
wuffs_base__range_ie_u32__get_min_incl(&self->private_impl.f_dirty_y),
self->private_impl.f_frame_rect_x1,
wuffs_base__range_ie_u32__get_max_excl(&self->private_impl.f_dirty_y));
@@ -8525,7 +8513,7 @@
}
return wuffs_base__utility__make_range_ii_u64(
- &self->private_impl.f_util, ((uint64_t)(self->private_impl.f_width)),
+ ((uint64_t)(self->private_impl.f_width)),
((uint64_t)(self->private_impl.f_width)));
}
@@ -8621,7 +8609,6 @@
wuffs_base__frame_config__update(
a_dst,
wuffs_base__utility__make_rect_ie_u32(
- &self->private_impl.f_util,
wuffs_base__u32__min(self->private_impl.f_frame_rect_x0,
self->private_impl.f_width),
wuffs_base__u32__min(self->private_impl.f_frame_rect_y0,
@@ -10266,9 +10253,8 @@
u_r.meta.ri = iop_v_r - u_r.data.ptr;
wuffs_base__status t_1 = wuffs_lzw__decoder__decode_io_writer(
&self->private_impl.f_lzw,
- wuffs_base__utility__null_io_writer(&self->private_impl.f_util),
- v_r,
- wuffs_base__utility__null_slice_u8(&self->private_impl.f_util));
+ wuffs_base__utility__null_io_writer(), v_r,
+ wuffs_base__utility__null_slice_u8());
iop_v_r = u_r.data.ptr + u_r.meta.ri;
v_lzw_status = t_1;
}
@@ -10414,7 +10400,7 @@
self->private_impl.f_dirty_y = wuffs_base__range_ie_u32__unite(
&self->private_impl.f_dirty_y,
wuffs_base__utility__make_range_ie_u32(
- &self->private_impl.f_util, self->private_impl.f_dst_y,
+ self->private_impl.f_dst_y,
wuffs_base__u32__sat_add(self->private_impl.f_dst_y, 1)));
}
if (self->private_impl.f_frame_rect_x1 <= self->private_impl.f_dst_x) {
@@ -10559,8 +10545,7 @@
return ((wuffs_base__range_ii_u64){});
}
- return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util,
- 33280, 33280);
+ return wuffs_base__utility__make_range_ii_u64(33280, 33280);
}
// -------- func gzip.decoder.decode_io_writer
@@ -11023,8 +11008,7 @@
return ((wuffs_base__range_ii_u64){});
}
- return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util,
- 33280, 33280);
+ return wuffs_base__utility__make_range_ii_u64(33280, 33280);
}
// -------- func zlib.decoder.decode_io_writer
