mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
std: rename foo_got variables to foo_have
This commit is contained in:
1 parent
2afec50f62
commit
77fa011072
3 files changed
+33
-33
No files matched your search
@@ -9442,8 +9442,8 @@ struct wuffs_gzip__decoder__struct {
|
||||
|
||||
struct {
|
||||
uint8_t v_flags;
|
||||
uint32_t v_checksum_got;
|
||||
uint32_t v_decoded_length_got;
|
||||
uint32_t v_checksum_have;
|
||||
uint32_t v_decoded_length_have;
|
||||
uint32_t v_checksum_want;
|
||||
uint64_t scratch;
|
||||
} s_do_transform_io;
|
||||
@@ -11736,7 +11736,7 @@ struct wuffs_zlib__decoder__struct {
|
||||
bool f_want_dictionary;
|
||||
bool f_quirks[1];
|
||||
bool f_ignore_checksum;
|
||||
uint32_t f_dict_id_got;
|
||||
uint32_t f_dict_id_have;
|
||||
uint32_t f_dict_id_want;
|
||||
|
||||
uint32_t p_transform_io;
|
||||
@@ -11749,7 +11749,7 @@ struct wuffs_zlib__decoder__struct {
|
||||
wuffs_deflate__decoder f_flate;
|
||||
|
||||
struct {
|
||||
uint32_t v_checksum_got;
|
||||
uint32_t v_checksum_have;
|
||||
uint64_t scratch;
|
||||
} s_do_transform_io;
|
||||
} private_data;
|
||||
@@ -41550,8 +41550,8 @@ wuffs_gzip__decoder__do_transform_io(
|
||||
uint8_t v_flags = 0;
|
||||
uint16_t v_xlen = 0;
|
||||
uint64_t v_mark = 0;
|
||||
uint32_t v_checksum_got = 0;
|
||||
uint32_t v_decoded_length_got = 0;
|
||||
uint32_t v_checksum_have = 0;
|
||||
uint32_t v_decoded_length_have = 0;
|
||||
wuffs_base__status v_status = wuffs_base__make_status(NULL);
|
||||
uint32_t v_checksum_want = 0;
|
||||
uint32_t v_decoded_length_want = 0;
|
||||
@@ -41583,8 +41583,8 @@ wuffs_gzip__decoder__do_transform_io(
|
||||
uint32_t coro_susp_point = self->private_impl.p_do_transform_io;
|
||||
if (coro_susp_point) {
|
||||
v_flags = self->private_data.s_do_transform_io.v_flags;
|
||||
v_checksum_got = self->private_data.s_do_transform_io.v_checksum_got;
|
||||
v_decoded_length_got = self->private_data.s_do_transform_io.v_decoded_length_got;
|
||||
v_checksum_have = self->private_data.s_do_transform_io.v_checksum_have;
|
||||
v_decoded_length_have = self->private_data.s_do_transform_io.v_decoded_length_have;
|
||||
v_checksum_want = self->private_data.s_do_transform_io.v_checksum_want;
|
||||
}
|
||||
switch (coro_susp_point) {
|
||||
@@ -41753,8 +41753,8 @@ wuffs_gzip__decoder__do_transform_io(
|
||||
}
|
||||
}
|
||||
if ( ! self->private_impl.f_ignore_checksum) {
|
||||
v_checksum_got = wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_checksum, wuffs_private_impl__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst));
|
||||
v_decoded_length_got += ((uint32_t)(wuffs_private_impl__io__count_since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)))));
|
||||
v_checksum_have = wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_checksum, wuffs_private_impl__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst));
|
||||
v_decoded_length_have += ((uint32_t)(wuffs_private_impl__io__count_since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)))));
|
||||
}
|
||||
if (wuffs_base__status__is_ok(&v_status)) {
|
||||
break;
|
||||
@@ -41820,7 +41820,7 @@ wuffs_gzip__decoder__do_transform_io(
|
||||
}
|
||||
v_decoded_length_want = t_9;
|
||||
}
|
||||
if ( ! self->private_impl.f_ignore_checksum && ((v_checksum_got != v_checksum_want) || (v_decoded_length_got != v_decoded_length_want))) {
|
||||
if ( ! self->private_impl.f_ignore_checksum && ((v_checksum_have != v_checksum_want) || (v_decoded_length_have != v_decoded_length_want))) {
|
||||
status = wuffs_base__make_status(wuffs_gzip__error__bad_checksum);
|
||||
goto exit;
|
||||
}
|
||||
@@ -41834,8 +41834,8 @@ wuffs_gzip__decoder__do_transform_io(
|
||||
suspend:
|
||||
self->private_impl.p_do_transform_io = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
|
||||
self->private_data.s_do_transform_io.v_flags = v_flags;
|
||||
self->private_data.s_do_transform_io.v_checksum_got = v_checksum_got;
|
||||
self->private_data.s_do_transform_io.v_decoded_length_got = v_decoded_length_got;
|
||||
self->private_data.s_do_transform_io.v_checksum_have = v_checksum_have;
|
||||
self->private_data.s_do_transform_io.v_decoded_length_have = v_decoded_length_have;
|
||||
self->private_data.s_do_transform_io.v_checksum_want = v_checksum_want;
|
||||
|
||||
goto exit;
|
||||
@@ -55749,7 +55749,7 @@ wuffs_zlib__decoder__add_dictionary(
|
||||
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_u32(&self->private_data.f_dict_id_hasher, a_dict);
|
||||
self->private_impl.f_dict_id_have = 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);
|
||||
}
|
||||
self->private_impl.f_got_dictionary = true;
|
||||
@@ -55933,7 +55933,7 @@ wuffs_zlib__decoder__do_transform_io(
|
||||
wuffs_base__status status = wuffs_base__make_status(NULL);
|
||||
|
||||
uint16_t v_x = 0;
|
||||
uint32_t v_checksum_got = 0;
|
||||
uint32_t v_checksum_have = 0;
|
||||
wuffs_base__status v_status = wuffs_base__make_status(NULL);
|
||||
uint32_t v_checksum_want = 0;
|
||||
uint64_t v_mark = 0;
|
||||
@@ -55964,7 +55964,7 @@ wuffs_zlib__decoder__do_transform_io(
|
||||
|
||||
uint32_t coro_susp_point = self->private_impl.p_do_transform_io;
|
||||
if (coro_susp_point) {
|
||||
v_checksum_got = self->private_data.s_do_transform_io.v_checksum_got;
|
||||
v_checksum_have = self->private_data.s_do_transform_io.v_checksum_have;
|
||||
}
|
||||
switch (coro_susp_point) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
|
||||
@@ -56017,7 +56017,7 @@ wuffs_zlib__decoder__do_transform_io(
|
||||
}
|
||||
self->private_impl.f_want_dictionary = (((uint16_t)(v_x & 32u)) != 0u);
|
||||
if (self->private_impl.f_want_dictionary) {
|
||||
self->private_impl.f_dict_id_got = 1u;
|
||||
self->private_impl.f_dict_id_have = 1u;
|
||||
{
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
|
||||
uint32_t t_1;
|
||||
@@ -56053,7 +56053,7 @@ wuffs_zlib__decoder__do_transform_io(
|
||||
status = wuffs_base__make_status(wuffs_zlib__error__incorrect_dictionary);
|
||||
goto exit;
|
||||
}
|
||||
} else if (self->private_impl.f_dict_id_got != self->private_impl.f_dict_id_want) {
|
||||
} else if (self->private_impl.f_dict_id_have != self->private_impl.f_dict_id_want) {
|
||||
if (self->private_impl.f_got_dictionary) {
|
||||
status = wuffs_base__make_status(wuffs_zlib__error__incorrect_dictionary);
|
||||
goto exit;
|
||||
@@ -56081,7 +56081,7 @@ wuffs_zlib__decoder__do_transform_io(
|
||||
}
|
||||
}
|
||||
if ( ! self->private_impl.f_ignore_checksum && ! self->private_impl.f_quirks[0u]) {
|
||||
v_checksum_got = wuffs_adler32__hasher__update_u32(&self->private_data.f_checksum, wuffs_private_impl__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst));
|
||||
v_checksum_have = wuffs_adler32__hasher__update_u32(&self->private_data.f_checksum, wuffs_private_impl__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst));
|
||||
}
|
||||
if (wuffs_base__status__is_ok(&v_status)) {
|
||||
break;
|
||||
@@ -56119,7 +56119,7 @@ wuffs_zlib__decoder__do_transform_io(
|
||||
}
|
||||
v_checksum_want = t_3;
|
||||
}
|
||||
if ( ! self->private_impl.f_ignore_checksum && (v_checksum_got != v_checksum_want)) {
|
||||
if ( ! self->private_impl.f_ignore_checksum && (v_checksum_have != v_checksum_want)) {
|
||||
status = wuffs_base__make_status(wuffs_zlib__error__bad_checksum);
|
||||
goto exit;
|
||||
}
|
||||
@@ -56133,7 +56133,7 @@ wuffs_zlib__decoder__do_transform_io(
|
||||
goto suspend;
|
||||
suspend:
|
||||
self->private_impl.p_do_transform_io = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
|
||||
self->private_data.s_do_transform_io.v_checksum_got = v_checksum_got;
|
||||
self->private_data.s_do_transform_io.v_checksum_have = v_checksum_have;
|
||||
|
||||
goto exit;
|
||||
exit:
|
||||
|
||||
@@ -73,8 +73,8 @@ pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, work
|
||||
var flags : base.u8
|
||||
var xlen : base.u16
|
||||
var mark : base.u64
|
||||
var checksum_got : base.u32
|
||||
var decoded_length_got : base.u32
|
||||
var checksum_have : base.u32
|
||||
var decoded_length_have : base.u32
|
||||
var status : base.status
|
||||
var checksum_want : base.u32
|
||||
var decoded_length_want : base.u32
|
||||
@@ -141,8 +141,8 @@ pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, work
|
||||
mark = args.dst.mark()
|
||||
status =? this.flate.transform_io?(dst: args.dst, src: args.src, workbuf: args.workbuf)
|
||||
if not this.ignore_checksum {
|
||||
checksum_got = this.checksum.update_u32!(x: args.dst.since(mark: mark))
|
||||
decoded_length_got ~mod+= (args.dst.count_since(mark: mark) & 0xFFFF_FFFF) as base.u32
|
||||
checksum_have = this.checksum.update_u32!(x: args.dst.since(mark: mark))
|
||||
decoded_length_have ~mod+= (args.dst.count_since(mark: mark) & 0xFFFF_FFFF) as base.u32
|
||||
}
|
||||
if status.is_ok() {
|
||||
break
|
||||
@@ -152,7 +152,7 @@ pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, work
|
||||
checksum_want = args.src.read_u32le?()
|
||||
decoded_length_want = args.src.read_u32le?()
|
||||
if (not this.ignore_checksum) and
|
||||
((checksum_got <> checksum_want) or (decoded_length_got <> decoded_length_want)) {
|
||||
((checksum_have <> checksum_want) or (decoded_length_have <> decoded_length_want)) {
|
||||
return "#bad checksum"
|
||||
}
|
||||
}
|
||||
@@ -38,7 +38,7 @@ pub struct decoder? implements base.io_transformer(
|
||||
checksum : adler32.hasher,
|
||||
|
||||
dict_id_hasher : adler32.hasher,
|
||||
dict_id_got : base.u32,
|
||||
dict_id_have : base.u32,
|
||||
dict_id_want : base.u32,
|
||||
|
||||
flate : deflate.decoder,
|
||||
@@ -54,7 +54,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_u32!(x: args.dict)
|
||||
this.dict_id_have = this.dict_id_hasher.update_u32!(x: args.dict)
|
||||
this.flate.add_history!(hist: args.dict)
|
||||
}
|
||||
this.got_dictionary = true
|
||||
@@ -117,7 +117,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
|
||||
|
||||
pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, workbuf: slice base.u8) {
|
||||
var x : base.u16
|
||||
var checksum_got : base.u32
|
||||
var checksum_have : base.u32
|
||||
var status : base.status
|
||||
var checksum_want : base.u32
|
||||
var mark : base.u64
|
||||
@@ -139,13 +139,13 @@ pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, work
|
||||
}
|
||||
this.want_dictionary = (x & 0x20) <> 0
|
||||
if this.want_dictionary {
|
||||
this.dict_id_got = 1 // Adler-32 initial value.
|
||||
this.dict_id_have = 1 // Adler-32 initial value.
|
||||
this.dict_id_want = args.src.read_u32be?()
|
||||
return "@dictionary required"
|
||||
} else if this.got_dictionary {
|
||||
return "#incorrect dictionary"
|
||||
}
|
||||
} else if this.dict_id_got <> this.dict_id_want {
|
||||
} else if this.dict_id_have <> this.dict_id_want {
|
||||
if this.got_dictionary {
|
||||
return "#incorrect dictionary"
|
||||
}
|
||||
@@ -159,7 +159,7 @@ pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, work
|
||||
mark = args.dst.mark()
|
||||
status =? this.flate.transform_io?(dst: args.dst, src: args.src, workbuf: args.workbuf)
|
||||
if (not this.ignore_checksum) and (not this.quirks[QUIRK_JUST_RAW_DEFLATE - QUIRKS_BASE]) {
|
||||
checksum_got = this.checksum.update_u32!(x: args.dst.since(mark: mark))
|
||||
checksum_have = this.checksum.update_u32!(x: args.dst.since(mark: mark))
|
||||
}
|
||||
if status.is_ok() {
|
||||
break
|
||||
@@ -169,7 +169,7 @@ pri func decoder.do_transform_io?(dst: base.io_writer, src: base.io_reader, work
|
||||
|
||||
if not this.quirks[QUIRK_JUST_RAW_DEFLATE - QUIRKS_BASE] {
|
||||
checksum_want = args.src.read_u32be?()
|
||||
if (not this.ignore_checksum) and (checksum_got <> checksum_want) {
|
||||
if (not this.ignore_checksum) and (checksum_have <> checksum_want) {
|
||||
return "#bad checksum"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user