mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Rename hasher update_u32 method
This commit is contained in:
1 parent
9e375309a4
commit
8ff9cdb9a6
8 files changed
+33
-33
No files matched your search
@@ -66,7 +66,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
while (true) {
|
||||
size_t n = fread(src_buffer, sizeof(uint8_t), SRC_BUFFER_SIZE, stdin);
|
||||
uint32_t checksum = h.update(wuffs_base__make_slice_u8(src_buffer, n));
|
||||
uint32_t checksum = h.update_u32(wuffs_base__make_slice_u8(src_buffer, n));
|
||||
if (feof(stdin)) {
|
||||
printf("%08" PRIx32 "\n", checksum);
|
||||
return 0;
|
||||
|
||||
@@ -2606,8 +2606,8 @@ sizeof__wuffs_adler32__hasher();
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint32_t //
|
||||
wuffs_adler32__hasher__update(wuffs_adler32__hasher* self,
|
||||
wuffs_base__slice_u8 a_x);
|
||||
wuffs_adler32__hasher__update_u32(wuffs_adler32__hasher* self,
|
||||
wuffs_base__slice_u8 a_x);
|
||||
|
||||
// ---------------- Struct Definitions
|
||||
|
||||
@@ -2670,8 +2670,8 @@ struct wuffs_adler32__hasher__struct {
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
update(wuffs_base__slice_u8 a_x) {
|
||||
return wuffs_adler32__hasher__update(this, a_x);
|
||||
update_u32(wuffs_base__slice_u8 a_x) {
|
||||
return wuffs_adler32__hasher__update_u32(this, a_x);
|
||||
}
|
||||
|
||||
#if (__cplusplus >= 201103L) && !defined(WUFFS_IMPLEMENTATION)
|
||||
@@ -2723,8 +2723,8 @@ sizeof__wuffs_crc32__ieee_hasher();
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint32_t //
|
||||
wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
|
||||
wuffs_base__slice_u8 a_x);
|
||||
wuffs_crc32__ieee_hasher__update_u32(wuffs_crc32__ieee_hasher* self,
|
||||
wuffs_base__slice_u8 a_x);
|
||||
|
||||
// ---------------- Struct Definitions
|
||||
|
||||
@@ -2786,8 +2786,8 @@ struct wuffs_crc32__ieee_hasher__struct {
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
update(wuffs_base__slice_u8 a_x) {
|
||||
return wuffs_crc32__ieee_hasher__update(this, a_x);
|
||||
update_u32(wuffs_base__slice_u8 a_x) {
|
||||
return wuffs_crc32__ieee_hasher__update_u32(this, a_x);
|
||||
}
|
||||
|
||||
#if (__cplusplus >= 201103L) && !defined(WUFFS_IMPLEMENTATION)
|
||||
@@ -4945,11 +4945,11 @@ sizeof__wuffs_adler32__hasher() {
|
||||
|
||||
// ---------------- Function Implementations
|
||||
|
||||
// -------- func adler32.hasher.update
|
||||
// -------- func adler32.hasher.update_u32
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint32_t //
|
||||
wuffs_adler32__hasher__update(wuffs_adler32__hasher* self,
|
||||
wuffs_base__slice_u8 a_x) {
|
||||
wuffs_adler32__hasher__update_u32(wuffs_adler32__hasher* self,
|
||||
wuffs_base__slice_u8 a_x) {
|
||||
if (!self) {
|
||||
return 0;
|
||||
}
|
||||
@@ -5955,11 +5955,11 @@ sizeof__wuffs_crc32__ieee_hasher() {
|
||||
|
||||
// ---------------- Function Implementations
|
||||
|
||||
// -------- func crc32.ieee_hasher.update
|
||||
// -------- func crc32.ieee_hasher.update_u32
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint32_t //
|
||||
wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
|
||||
wuffs_base__slice_u8 a_x) {
|
||||
wuffs_crc32__ieee_hasher__update_u32(wuffs_crc32__ieee_hasher* self,
|
||||
wuffs_base__slice_u8 a_x) {
|
||||
if (!self) {
|
||||
return 0;
|
||||
}
|
||||
@@ -11451,7 +11451,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self,
|
||||
v_status = t_7;
|
||||
}
|
||||
if (!self->private_impl.f_ignore_checksum) {
|
||||
v_checksum_got = wuffs_crc32__ieee_hasher__update(
|
||||
v_checksum_got = wuffs_crc32__ieee_hasher__update_u32(
|
||||
&self->private_data.f_checksum,
|
||||
wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)),
|
||||
io0_a_dst));
|
||||
@@ -11696,7 +11696,7 @@ wuffs_zlib__decoder__add_dictionary(wuffs_zlib__decoder* self,
|
||||
if (self->private_impl.f_header_complete) {
|
||||
self->private_impl.f_bad_call_sequence = true;
|
||||
} else {
|
||||
self->private_impl.f_dict_id_got = wuffs_adler32__hasher__update(
|
||||
self->private_impl.f_dict_id_got = wuffs_adler32__hasher__update_u32(
|
||||
&self->private_data.f_dict_id_hasher, a_dict);
|
||||
wuffs_deflate__decoder__add_history(&self->private_data.f_flate, a_dict);
|
||||
}
|
||||
@@ -11913,7 +11913,7 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self,
|
||||
v_status = t_2;
|
||||
}
|
||||
if (!self->private_impl.f_ignore_checksum) {
|
||||
v_checksum_got = wuffs_adler32__hasher__update(
|
||||
v_checksum_got = wuffs_adler32__hasher__update_u32(
|
||||
&self->private_data.f_checksum,
|
||||
wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)),
|
||||
io0_a_dst));
|
||||
|
||||
@@ -18,7 +18,7 @@ pub struct hasher?(
|
||||
started : base.bool,
|
||||
)
|
||||
|
||||
pub func hasher.update!(x: slice base.u8) base.u32 {
|
||||
pub func hasher.update_u32!(x: slice base.u8) base.u32 {
|
||||
// The Adler-32 checksum's magic 65521 and 5552 numbers are discussed in
|
||||
// this package's README.md.
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ pub struct ieee_hasher?(
|
||||
// TODO: should it be ? instead of ! because it's public, and might need a way
|
||||
// to signal "initializer not called"? Should the return type, in the generated
|
||||
// C code, be "struct{ uint32_t checksum; wuffs_crc32__status status }"?
|
||||
pub func ieee_hasher.update!(x: slice base.u8) base.u32 {
|
||||
pub func ieee_hasher.update_u32!(x: slice base.u8) base.u32 {
|
||||
var s : base.u32
|
||||
var p : slice base.u8
|
||||
|
||||
|
||||
@@ -115,7 +115,7 @@ pub func decoder.decode_io_writer?(dst: base.io_writer, src: base.io_reader, wor
|
||||
mark = args.dst.mark()
|
||||
status =? this.flate.decode_io_writer?(dst: args.dst, src: args.src, workbuf: args.workbuf)
|
||||
if not this.ignore_checksum {
|
||||
checksum_got = this.checksum.update!(x: args.dst.since(mark: mark))
|
||||
checksum_got = this.checksum.update_u32!(x: args.dst.since(mark: mark))
|
||||
decoded_length_got ~mod+= ((args.dst.count_since(mark: mark) & 0xFFFFFFFF) as base.u32)
|
||||
}
|
||||
if status.is_ok() {
|
||||
|
||||
@@ -53,7 +53,7 @@ pub func decoder.add_dictionary!(dict: slice base.u8) {
|
||||
if this.header_complete {
|
||||
this.bad_call_sequence = true
|
||||
} else {
|
||||
this.dict_id_got = this.dict_id_hasher.update!(x: args.dict)
|
||||
this.dict_id_got = this.dict_id_hasher.update_u32!(x: args.dict)
|
||||
this.flate.add_history!(hist: args.dict)
|
||||
}
|
||||
this.got_dictionary = true
|
||||
@@ -111,7 +111,7 @@ pub func decoder.decode_io_writer?(dst: base.io_writer, src: base.io_reader, wor
|
||||
mark = args.dst.mark()
|
||||
status =? this.flate.decode_io_writer?(dst: args.dst, src: args.src, workbuf: args.workbuf)
|
||||
if not this.ignore_checksum {
|
||||
checksum_got = this.checksum.update!(x: args.dst.since(mark: mark))
|
||||
checksum_got = this.checksum.update_u32!(x: args.dst.since(mark: mark))
|
||||
}
|
||||
if status.is_ok() {
|
||||
break
|
||||
|
||||
@@ -149,7 +149,7 @@ const char* test_wuffs_adler32_golden() {
|
||||
if ((j > 0) && (data.len > limit)) {
|
||||
data.len = limit;
|
||||
}
|
||||
got = wuffs_adler32__hasher__update(&checksum, data);
|
||||
got = wuffs_adler32__hasher__update_u32(&checksum, data);
|
||||
num_fragments++;
|
||||
num_bytes += data.len;
|
||||
} while (num_bytes < src.meta.wi);
|
||||
@@ -207,11 +207,11 @@ const char* test_wuffs_adler32_pi() {
|
||||
if (status) {
|
||||
RETURN_FAIL("initialize: \"%s\"", status);
|
||||
}
|
||||
uint32_t got =
|
||||
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = (uint8_t*)(digits),
|
||||
.len = i,
|
||||
}));
|
||||
uint32_t got = wuffs_adler32__hasher__update_u32(
|
||||
&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = (uint8_t*)(digits),
|
||||
.len = i,
|
||||
}));
|
||||
if (got != wants[i]) {
|
||||
RETURN_FAIL("i=%d: got 0x%08" PRIX32 ", want 0x%08" PRIX32, i, got,
|
||||
wants[i]);
|
||||
@@ -239,7 +239,7 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
|
||||
if (status) {
|
||||
return status;
|
||||
}
|
||||
global_wuffs_adler32_unused_u32 = wuffs_adler32__hasher__update(
|
||||
global_wuffs_adler32_unused_u32 = wuffs_adler32__hasher__update_u32(
|
||||
&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = src->data.ptr + src->meta.ri,
|
||||
.len = len,
|
||||
|
||||
+3
-3
@@ -149,7 +149,7 @@ const char* test_wuffs_crc32_ieee_golden() {
|
||||
if ((j > 0) && (data.len > limit)) {
|
||||
data.len = limit;
|
||||
}
|
||||
got = wuffs_crc32__ieee_hasher__update(&checksum, data);
|
||||
got = wuffs_crc32__ieee_hasher__update_u32(&checksum, data);
|
||||
num_fragments++;
|
||||
num_bytes += data.len;
|
||||
} while (num_bytes < src.meta.wi);
|
||||
@@ -228,7 +228,7 @@ const char* do_test_xxxxx_crc32_ieee_pi(bool mimic) {
|
||||
if (status) {
|
||||
RETURN_FAIL("initialize: \"%s\"", status);
|
||||
}
|
||||
got = wuffs_crc32__ieee_hasher__update(&checksum, data);
|
||||
got = wuffs_crc32__ieee_hasher__update_u32(&checksum, data);
|
||||
}
|
||||
|
||||
if (got != wants[i]) {
|
||||
@@ -274,7 +274,7 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
|
||||
if (status) {
|
||||
return status;
|
||||
}
|
||||
global_wuffs_crc32_unused_u32 = wuffs_crc32__ieee_hasher__update(
|
||||
global_wuffs_crc32_unused_u32 = wuffs_crc32__ieee_hasher__update_u32(
|
||||
&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = src->data.ptr + src->meta.ri,
|
||||
.len = len,
|
||||
|
||||
Reference in new issue
Block a user