mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 16:47:28 +01:00
Rename the implicit in variable to args
This commit is contained in:
1 parent
58ded30954
commit
ca06083f8a
19 files changed
+254
-252
No files matched your search
+17
-17
@@ -29,31 +29,31 @@ pub struct decoder?(
|
||||
)
|
||||
|
||||
pub func decoder.set_ignore_checksum!(ic base.bool) {
|
||||
this.ignore_checksum = in.ic
|
||||
this.ignore_checksum = args.ic
|
||||
}
|
||||
|
||||
pub func decoder.decode?(dst base.io_writer, src base.io_reader) {
|
||||
// Read the header.
|
||||
var c base.u8 = in.src.read_u8?()
|
||||
var c base.u8 = args.src.read_u8?()
|
||||
if c != 0x1F {
|
||||
return error "bad header"
|
||||
}
|
||||
c = in.src.read_u8?()
|
||||
c = args.src.read_u8?()
|
||||
if c != 0x8B {
|
||||
return error "bad header"
|
||||
}
|
||||
c = in.src.read_u8?()
|
||||
c = args.src.read_u8?()
|
||||
if c != 0x08 {
|
||||
return error "bad compression method"
|
||||
}
|
||||
var flags base.u8 = in.src.read_u8?()
|
||||
var flags base.u8 = args.src.read_u8?()
|
||||
// TODO: API for returning the header's MTIME field.
|
||||
in.src.skip?(n:6)
|
||||
args.src.skip?(n:6)
|
||||
|
||||
// Handle FEXTRA.
|
||||
if (flags & 0x04) != 0 {
|
||||
var xlen base.u16 = in.src.read_u16le?()
|
||||
in.src.skip?(n:xlen as base.u32)
|
||||
var xlen base.u16 = args.src.read_u16le?()
|
||||
args.src.skip?(n:xlen as base.u32)
|
||||
}
|
||||
|
||||
// Handle FNAME.
|
||||
@@ -63,7 +63,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader) {
|
||||
// filename length to NAME_MAX, which is 255.
|
||||
if (flags & 0x08) != 0 {
|
||||
while true {
|
||||
c = in.src.read_u8?()
|
||||
c = args.src.read_u8?()
|
||||
if c == 0 {
|
||||
break
|
||||
}
|
||||
@@ -73,7 +73,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader) {
|
||||
// Handle FCOMMENT.
|
||||
if (flags & 0x10) != 0 {
|
||||
while true {
|
||||
c = in.src.read_u8?()
|
||||
c = args.src.read_u8?()
|
||||
if c == 0 {
|
||||
break
|
||||
}
|
||||
@@ -82,7 +82,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader) {
|
||||
|
||||
// Handle FHCRC.
|
||||
if (flags & 0x02) != 0 {
|
||||
in.src.skip?(n:2)
|
||||
args.src.skip?(n:2)
|
||||
}
|
||||
|
||||
// Reserved flags bits must be zero.
|
||||
@@ -94,19 +94,19 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader) {
|
||||
var checksum_got base.u32
|
||||
var decoded_length_got base.u32
|
||||
while true {
|
||||
in.dst.set_mark!()
|
||||
var z base.status = try this.flate.decode?(dst:in.dst, src:in.src)
|
||||
args.dst.set_mark!()
|
||||
var z base.status = try this.flate.decode?(dst:args.dst, src:args.src)
|
||||
if not this.ignore_checksum {
|
||||
checksum_got = this.checksum.update!(x:in.dst.since_mark())
|
||||
decoded_length_got ~mod+= ((in.dst.since_mark().length() & 0xFFFFFFFF) as base.u32)
|
||||
checksum_got = this.checksum.update!(x:args.dst.since_mark())
|
||||
decoded_length_got ~mod+= ((args.dst.since_mark().length() & 0xFFFFFFFF) as base.u32)
|
||||
}
|
||||
if z.is_ok() {
|
||||
break
|
||||
}
|
||||
yield z
|
||||
}
|
||||
var checksum_want base.u32 = in.src.read_u32le?()
|
||||
var decoded_length_want base.u32 = in.src.read_u32le?()
|
||||
var checksum_want base.u32 = args.src.read_u32le?()
|
||||
var decoded_length_want base.u32 = args.src.read_u32le?()
|
||||
if (not this.ignore_checksum) and
|
||||
((checksum_got != checksum_want) or (decoded_length_got != decoded_length_want)) {
|
||||
return error "bad checksum"
|
||||
|
||||
Reference in new issue
Block a user