Have check_wuffs_version take the sizeof receiver

Also rename foo__initialize to foo__check_wuffs_version.
This commit is contained in:
Nigel Tao committed 2018-05-29 14:20:27 +10:00
1 parent d59eec7936
commit 87ab36f8c4
28 files changed
+354 -361

No files matched your search

+9 -19
View File
@@ -1211,14 +1211,14 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_adler32__hasher__initialize is an initializer function.
// wuffs_adler32__hasher__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_adler32__hasher__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1259,13 +1259,6 @@ uint32_t wuffs_adler32__hasher__update(wuffs_adler32__hasher* self,
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
// to a containee struct's initializer when the container has already zeroed
// the containee's memory.
//
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
@@ -1796,19 +1789,16 @@ const char* wuffs_adler32__status__string(wuffs_adler32__status s) {
// ---------------- Initializer Implementations
void wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only) {
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION;
return;
}
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
}
+11 -19
View File
@@ -1209,14 +1209,15 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_crc32__ieee_hasher__initialize is an initializer function.
// wuffs_crc32__ieee_hasher__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_crc32__ieee_hasher__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_crc32__ieee_hasher__check_wuffs_version(
wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1257,13 +1258,6 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
// to a containee struct's initializer when the container has already zeroed
// the containee's memory.
//
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
@@ -2157,19 +2151,17 @@ static const uint32_t wuffs_crc32__ieee_table[8][256] = {
// ---------------- Initializer Implementations
void wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only) {
void wuffs_crc32__ieee_hasher__check_wuffs_version(
wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
self->private_impl.status = WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION;
return;
}
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
}
+9 -19
View File
@@ -1299,14 +1299,14 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_deflate__decoder__initialize is an initializer function.
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_deflate__decoder__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1349,13 +1349,6 @@ wuffs_deflate__status wuffs_deflate__decoder__decode(
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
// to a containee struct's initializer when the container has already zeroed
// the containee's memory.
//
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
@@ -1979,19 +1972,16 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
// ---------------- Initializer Implementations
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only) {
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION;
return;
}
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
}
+26 -33
View File
@@ -1343,14 +1343,14 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_gif__decoder__initialize is an initializer function.
// wuffs_gif__decoder__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_gif__decoder__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_gif__decoder__initialize(wuffs_gif__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1402,13 +1402,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_up_to_id_part1(
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
// to a containee struct's initializer when the container has already zeroed
// the containee's memory.
//
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
@@ -1955,9 +1948,15 @@ static const uint8_t wuffs_gif__netscape2dot0[11] = {
// ---------------- Private Initializer Prototypes
void wuffs_gif__lzw_decoder__initialize(wuffs_gif__lzw_decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
static inline void wuffs_gif__lzw_decoder__reset(wuffs_gif__lzw_decoder* self) {
memset(self, 0, sizeof *self);
wuffs_gif__lzw_decoder__check_wuffs_version(self, WUFFS_VERSION,
sizeof *self);
}
// ---------------- Private Function Prototypes
@@ -2009,38 +2008,33 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode(
// ---------------- Initializer Implementations
void wuffs_gif__lzw_decoder__initialize(wuffs_gif__lzw_decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only) {
void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
return;
}
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
}
void wuffs_gif__decoder__initialize(wuffs_gif__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only) {
void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
return;
}
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
wuffs_gif__lzw_decoder__initialize(&self->private_impl.f_lzw, WUFFS_VERSION,
WUFFS_BASE__ALREADY_ZEROED);
wuffs_gif__lzw_decoder__check_wuffs_version(&self->private_impl.f_lzw,
WUFFS_VERSION,
sizeof(self->private_impl.f_lzw));
}
// ---------------- Function Implementations
@@ -3383,8 +3377,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
}
}
if (self->private_impl.f_previous_lzw_decode_ended_abruptly) {
wuffs_gif__lzw_decoder__initialize(&self->private_impl.f_lzw,
WUFFS_VERSION, 0);
wuffs_gif__lzw_decoder__reset(&self->private_impl.f_lzw);
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
+26 -34
View File
@@ -1218,14 +1218,15 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_crc32__ieee_hasher__initialize is an initializer function.
// wuffs_crc32__ieee_hasher__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_crc32__ieee_hasher__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_crc32__ieee_hasher__check_wuffs_version(
wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1398,14 +1399,14 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_deflate__decoder__initialize is an initializer function.
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_deflate__decoder__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1500,14 +1501,14 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_gzip__decoder__initialize is an initializer function.
// wuffs_gzip__decoder__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_gzip__decoder__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1552,13 +1553,6 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self,
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
// to a containee struct's initializer when the container has already zeroed
// the containee's memory.
//
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
@@ -2098,25 +2092,23 @@ const char* wuffs_gzip__status__string(wuffs_gzip__status s) {
// ---------------- Initializer Implementations
void wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only) {
void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
self->private_impl.status = WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION;
return;
}
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
wuffs_deflate__decoder__initialize(&self->private_impl.f_flate, WUFFS_VERSION,
WUFFS_BASE__ALREADY_ZEROED);
wuffs_crc32__ieee_hasher__initialize(&self->private_impl.f_checksum,
WUFFS_VERSION,
WUFFS_BASE__ALREADY_ZEROED);
wuffs_deflate__decoder__check_wuffs_version(
&self->private_impl.f_flate, WUFFS_VERSION,
sizeof(self->private_impl.f_flate));
wuffs_crc32__ieee_hasher__check_wuffs_version(
&self->private_impl.f_checksum, WUFFS_VERSION,
sizeof(self->private_impl.f_checksum));
}
// ---------------- Function Implementations
+25 -33
View File
@@ -1220,14 +1220,14 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_adler32__hasher__initialize is an initializer function.
// wuffs_adler32__hasher__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_adler32__hasher__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1400,14 +1400,14 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_deflate__decoder__initialize is an initializer function.
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_deflate__decoder__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1501,14 +1501,14 @@ typedef struct {
// ---------------- Public Initializer Prototypes
// wuffs_zlib__decoder__initialize is an initializer function.
// wuffs_zlib__decoder__check_wuffs_version is an initializer function.
//
// It should be called before any other wuffs_zlib__decoder__* function.
//
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only);
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
// ---------------- Public Function Prototypes
@@ -1553,13 +1553,6 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
// to a containee struct's initializer when the container has already zeroed
// the containee's memory.
//
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
@@ -2100,24 +2093,23 @@ const char* wuffs_zlib__status__string(wuffs_zlib__status s) {
// ---------------- Initializer Implementations
void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self,
uint32_t wuffs_version,
uint32_t for_internal_use_only) {
void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION;
return;
}
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
wuffs_deflate__decoder__initialize(&self->private_impl.f_flate, WUFFS_VERSION,
WUFFS_BASE__ALREADY_ZEROED);
wuffs_adler32__hasher__initialize(&self->private_impl.f_checksum,
WUFFS_VERSION, WUFFS_BASE__ALREADY_ZEROED);
wuffs_deflate__decoder__check_wuffs_version(
&self->private_impl.f_flate, WUFFS_VERSION,
sizeof(self->private_impl.f_flate));
wuffs_adler32__hasher__check_wuffs_version(
&self->private_impl.f_checksum, WUFFS_VERSION,
sizeof(self->private_impl.f_checksum));
}
// ---------------- Function Implementations