base: have empty_foo() functions use NULL ptr

This largely reverts commit f81deb6b6e.

Updates #135
This commit is contained in:
Nigel Tao committed 2024-04-05 15:29:51 +11:00
1 parent 2142aa65fc
commit d7f6b81d31
6 files changed
+22 -125

No files matched your search

-15
View File
@@ -111,21 +111,6 @@ const uint32_t wuffs_private_impl__pixel_format__bits_per_channel[16] = {
0x08, 0x0A, 0x0C, 0x10, 0x18, 0x20, 0x30, 0x40,
};
const uint8_t //
wuffs_private_impl__placeholder_u8_with_non_null_address = 0;
const uint16_t //
wuffs_private_impl__placeholder_u16_with_non_null_address = 0;
const uint32_t //
wuffs_private_impl__placeholder_u32_with_non_null_address = 0;
const uint64_t //
wuffs_private_impl__placeholder_u64_with_non_null_address = 0;
const wuffs_base__token //
wuffs_private_impl__placeholder_token_with_non_null_address = {0};
// ¡ INSERT wuffs_base__status strings.
// ¡ INSERT vtable names.
+8 -38
View File
@@ -395,28 +395,6 @@ wuffs_base__strip_const_from_u64_ptr(const uint64_t* ptr) {
// --------
// wuffs_private_impl__placeholder_etc_with_non_null_address provides non-NULL
// pointers to various integer types. These values aren't intended to ever be
// modified and their addresses aren't intended to ever be dereferenced.
//
// It's just that adding 0 to a NULL pointer can be undefined behavior (and
// UBSAN will complain), so functions like wuffs_base__empty_slice_u8 need some
// arbitrary non-NULL placeholder pointer, even though the slice has 0 length.
extern const uint8_t //
wuffs_private_impl__placeholder_u8_with_non_null_address;
extern const uint16_t //
wuffs_private_impl__placeholder_u16_with_non_null_address;
extern const uint32_t //
wuffs_private_impl__placeholder_u32_with_non_null_address;
extern const uint64_t //
wuffs_private_impl__placeholder_u64_with_non_null_address;
// --------
// wuffs_base__empty_struct is used when a Wuffs function returns an empty
// struct. In C, if a function f returns void, you can't say "x = f()", but in
// Wuffs, if a function g returns empty, you can say "y = g()".
@@ -1438,8 +1416,7 @@ wuffs_base__make_slice_u64_ij(uint64_t* ptr, size_t i, size_t j) {
static inline wuffs_base__slice_u8 //
wuffs_base__empty_slice_u8(void) {
wuffs_base__slice_u8 ret;
ret.ptr = wuffs_base__strip_const_from_u8_ptr(
&wuffs_private_impl__placeholder_u8_with_non_null_address);
ret.ptr = NULL;
ret.len = 0;
return ret;
}
@@ -1447,8 +1424,7 @@ wuffs_base__empty_slice_u8(void) {
static inline wuffs_base__slice_u16 //
wuffs_base__empty_slice_u16(void) {
wuffs_base__slice_u16 ret;
ret.ptr = wuffs_base__strip_const_from_u16_ptr(
&wuffs_private_impl__placeholder_u16_with_non_null_address);
ret.ptr = NULL;
ret.len = 0;
return ret;
}
@@ -1456,8 +1432,7 @@ wuffs_base__empty_slice_u16(void) {
static inline wuffs_base__slice_u32 //
wuffs_base__empty_slice_u32(void) {
wuffs_base__slice_u32 ret;
ret.ptr = wuffs_base__strip_const_from_u32_ptr(
&wuffs_private_impl__placeholder_u32_with_non_null_address);
ret.ptr = NULL;
ret.len = 0;
return ret;
}
@@ -1465,8 +1440,7 @@ wuffs_base__empty_slice_u32(void) {
static inline wuffs_base__slice_u64 //
wuffs_base__empty_slice_u64(void) {
wuffs_base__slice_u64 ret;
ret.ptr = wuffs_base__strip_const_from_u64_ptr(
&wuffs_private_impl__placeholder_u64_with_non_null_address);
ret.ptr = NULL;
ret.len = 0;
return ret;
}
@@ -1526,8 +1500,7 @@ wuffs_base__make_table_u64(uint64_t* ptr,
static inline wuffs_base__table_u8 //
wuffs_base__empty_table_u8(void) {
wuffs_base__table_u8 ret;
ret.ptr = wuffs_base__strip_const_from_u8_ptr(
&wuffs_private_impl__placeholder_u8_with_non_null_address);
ret.ptr = NULL;
ret.width = 0;
ret.height = 0;
ret.stride = 0;
@@ -1537,8 +1510,7 @@ wuffs_base__empty_table_u8(void) {
static inline wuffs_base__table_u16 //
wuffs_base__empty_table_u16(void) {
wuffs_base__table_u16 ret;
ret.ptr = wuffs_base__strip_const_from_u16_ptr(
&wuffs_private_impl__placeholder_u16_with_non_null_address);
ret.ptr = NULL;
ret.width = 0;
ret.height = 0;
ret.stride = 0;
@@ -1548,8 +1520,7 @@ wuffs_base__empty_table_u16(void) {
static inline wuffs_base__table_u32 //
wuffs_base__empty_table_u32(void) {
wuffs_base__table_u32 ret;
ret.ptr = wuffs_base__strip_const_from_u32_ptr(
&wuffs_private_impl__placeholder_u32_with_non_null_address);
ret.ptr = NULL;
ret.width = 0;
ret.height = 0;
ret.stride = 0;
@@ -1559,8 +1530,7 @@ wuffs_base__empty_table_u32(void) {
static inline wuffs_base__table_u64 //
wuffs_base__empty_table_u64(void) {
wuffs_base__table_u64 ret;
ret.ptr = wuffs_base__strip_const_from_u64_ptr(
&wuffs_private_impl__placeholder_u64_with_non_null_address);
ret.ptr = NULL;
ret.width = 0;
ret.height = 0;
ret.stride = 0;
+1 -2
View File
@@ -118,8 +118,7 @@ wuffs_base__slice_u8__writer(wuffs_base__slice_u8 s) {
static inline wuffs_base__io_buffer //
wuffs_base__empty_io_buffer(void) {
wuffs_base__io_buffer ret;
ret.data.ptr = wuffs_base__strip_const_from_u8_ptr(
&wuffs_private_impl__placeholder_u8_with_non_null_address);
ret.data.ptr = NULL;
ret.data.len = 0;
ret.meta.wi = 0;
ret.meta.ri = 0;
+2 -7
View File
@@ -277,9 +277,6 @@ wuffs_base__token::length() const {
// --------
extern const wuffs_base__token //
wuffs_private_impl__placeholder_token_with_non_null_address;
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-qual"
@@ -309,8 +306,7 @@ wuffs_base__make_slice_token(wuffs_base__token* ptr, size_t len) {
static inline wuffs_base__slice_token //
wuffs_base__empty_slice_token(void) {
wuffs_base__slice_token ret;
ret.ptr = wuffs_base__strip_const_from_token_ptr(
&wuffs_private_impl__placeholder_token_with_non_null_address);
ret.ptr = NULL;
ret.len = 0;
return ret;
}
@@ -399,8 +395,7 @@ wuffs_base__slice_token__writer(wuffs_base__slice_token s) {
static inline wuffs_base__token_buffer //
wuffs_base__empty_token_buffer(void) {
wuffs_base__token_buffer ret;
ret.data.ptr = wuffs_base__strip_const_from_token_ptr(
&wuffs_private_impl__placeholder_token_with_non_null_address);
ret.data.ptr = NULL;
ret.data.len = 0;
ret.meta.wi = 0;
ret.meta.ri = 0;