Change the order of check_wuffs_version args

This puts the self_ptr, self_len args next to each other.
This commit is contained in:
Nigel Tao committed 2018-05-29 21:59:50 +10:00
1 parent 1211e16e3c
commit 5b08ad2ba6
24 files changed
+184 -173

No files matched your search

+9 -9
View File
@@ -1219,10 +1219,10 @@ typedef struct {
//
// It should be called before any other wuffs_adler32__hasher__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -1796,19 +1796,19 @@ const char* wuffs_adler32__status__string(wuffs_adler32__status s) {
// ---------------- Initializer Implementations
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
size_t sizeof_star_self,
uint32_t wuffs_version) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION;
return;
}
if (sizeof(*self) != sizeof_star_self) {
self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER;
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION;
return;
}
if (self->private_impl.magic != 0) {
self->private_impl.status =
WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
+9 -9
View File
@@ -1217,11 +1217,11 @@ typedef struct {
//
// It should be called before any other wuffs_crc32__ieee_hasher__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_crc32__ieee_hasher__check_wuffs_version(
wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -2159,19 +2159,19 @@ static const uint32_t wuffs_crc32__ieee_table[8][256] = {
void wuffs_crc32__ieee_hasher__check_wuffs_version(
wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
size_t sizeof_star_self,
uint32_t wuffs_version) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION;
return;
}
if (sizeof(*self) != sizeof_star_self) {
self->private_impl.status = WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER;
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION;
return;
}
if (self->private_impl.magic != 0) {
self->private_impl.status =
WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
+9 -9
View File
@@ -1307,10 +1307,10 @@ typedef struct {
//
// It should be called before any other wuffs_deflate__decoder__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -1979,19 +1979,19 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
// ---------------- Initializer Implementations
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
size_t sizeof_star_self,
uint32_t wuffs_version) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION;
return;
}
if (sizeof(*self) != sizeof_star_self) {
self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER;
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION;
return;
}
if (self->private_impl.magic != 0) {
self->private_impl.status =
WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
+21 -21
View File
@@ -1351,10 +1351,10 @@ typedef struct {
//
// It should be called before any other wuffs_gif__decoder__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -1955,13 +1955,13 @@ static const uint8_t wuffs_gif__netscape2dot0[11] = {
// ---------------- Private Initializer Prototypes
void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
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);
wuffs_gif__lzw_decoder__check_wuffs_version(self, sizeof *self,
WUFFS_VERSION);
}
// ---------------- Private Function Prototypes
@@ -2015,19 +2015,19 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode(
// ---------------- Initializer Implementations
void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
size_t sizeof_star_self,
uint32_t wuffs_version) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
return;
}
if (sizeof(*self) != sizeof_star_self) {
self->private_impl.status = WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER;
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
return;
}
if (self->private_impl.magic != 0) {
self->private_impl.status =
WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
@@ -2037,19 +2037,19 @@ void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self,
}
void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
size_t sizeof_star_self,
uint32_t wuffs_version) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
return;
}
if (sizeof(*self) != sizeof_star_self) {
self->private_impl.status = WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER;
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
return;
}
if (self->private_impl.magic != 0) {
self->private_impl.status =
WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
@@ -2057,8 +2057,8 @@ void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
wuffs_gif__lzw_decoder__check_wuffs_version(&self->private_impl.f_lzw,
WUFFS_VERSION,
sizeof(self->private_impl.f_lzw));
sizeof(self->private_impl.f_lzw),
WUFFS_VERSION);
}
// ---------------- Function Implementations
+19 -19
View File
@@ -1226,11 +1226,11 @@ typedef struct {
//
// It should be called before any other wuffs_crc32__ieee_hasher__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_crc32__ieee_hasher__check_wuffs_version(
wuffs_crc32__ieee_hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -1411,10 +1411,10 @@ typedef struct {
//
// It should be called before any other wuffs_deflate__decoder__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -1517,10 +1517,10 @@ typedef struct {
//
// It should be called before any other wuffs_gzip__decoder__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -2107,19 +2107,19 @@ const char* wuffs_gzip__status__string(wuffs_gzip__status s) {
// ---------------- Initializer Implementations
void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
size_t sizeof_star_self,
uint32_t wuffs_version) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION;
return;
}
if (sizeof(*self) != sizeof_star_self) {
self->private_impl.status = WUFFS_GZIP__ERROR_BAD_SIZEOF_RECEIVER;
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION;
return;
}
if (self->private_impl.magic != 0) {
self->private_impl.status =
WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
@@ -2127,11 +2127,11 @@ void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
wuffs_deflate__decoder__check_wuffs_version(
&self->private_impl.f_flate, WUFFS_VERSION,
sizeof(self->private_impl.f_flate));
&self->private_impl.f_flate, sizeof(self->private_impl.f_flate),
WUFFS_VERSION);
wuffs_crc32__ieee_hasher__check_wuffs_version(
&self->private_impl.f_checksum, WUFFS_VERSION,
sizeof(self->private_impl.f_checksum));
&self->private_impl.f_checksum, sizeof(self->private_impl.f_checksum),
WUFFS_VERSION);
}
// ---------------- Function Implementations
+19 -19
View File
@@ -1228,10 +1228,10 @@ typedef struct {
//
// It should be called before any other wuffs_adler32__hasher__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -1412,10 +1412,10 @@ typedef struct {
//
// It should be called before any other wuffs_deflate__decoder__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -1517,10 +1517,10 @@ typedef struct {
//
// It should be called before any other wuffs_zlib__decoder__* function.
//
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self);
size_t sizeof_star_self,
uint32_t wuffs_version);
// ---------------- Public Function Prototypes
@@ -2108,19 +2108,19 @@ const char* wuffs_zlib__status__string(wuffs_zlib__status s) {
// ---------------- Initializer Implementations
void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
uint32_t wuffs_version,
size_t sizeof_star_self) {
size_t sizeof_star_self,
uint32_t wuffs_version) {
if (!self) {
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION;
return;
}
if (sizeof(*self) != sizeof_star_self) {
self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_SIZEOF_RECEIVER;
return;
}
if (wuffs_version != WUFFS_VERSION) {
self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION;
return;
}
if (self->private_impl.magic != 0) {
self->private_impl.status =
WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;
@@ -2128,11 +2128,11 @@ void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
wuffs_deflate__decoder__check_wuffs_version(
&self->private_impl.f_flate, WUFFS_VERSION,
sizeof(self->private_impl.f_flate));
&self->private_impl.f_flate, sizeof(self->private_impl.f_flate),
WUFFS_VERSION);
wuffs_adler32__hasher__check_wuffs_version(
&self->private_impl.f_checksum, WUFFS_VERSION,
sizeof(self->private_impl.f_checksum));
&self->private_impl.f_checksum, sizeof(self->private_impl.f_checksum),
WUFFS_VERSION);
}
// ---------------- Function Implementations