mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 08:47:28 +01:00
Rename the !?? effect to ?
This commit is contained in:
1 parent
1ea32b3745
commit
093268e179
11 files changed
+172
-172
No files matched your search
+14
-14
@@ -30,7 +30,7 @@ pub func decoder.set_ignore_checksum!(ic base.bool) {
|
||||
this.ignore_checksum = args.ic
|
||||
}
|
||||
|
||||
pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
pub func decoder.decode?(dst base.io_writer, src base.io_reader) {
|
||||
var c base.u8
|
||||
var flags base.u8
|
||||
var xlen base.u16
|
||||
@@ -41,26 +41,26 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
var decoded_length_want base.u32
|
||||
|
||||
// Read the header.
|
||||
c = args.src.read_u8!??()
|
||||
c = args.src.read_u8?()
|
||||
if c != 0x1F {
|
||||
return "?bad header"
|
||||
}
|
||||
c = args.src.read_u8!??()
|
||||
c = args.src.read_u8?()
|
||||
if c != 0x8B {
|
||||
return "?bad header"
|
||||
}
|
||||
c = args.src.read_u8!??()
|
||||
c = args.src.read_u8?()
|
||||
if c != 0x08 {
|
||||
return "?bad compression method"
|
||||
}
|
||||
flags = args.src.read_u8!??()
|
||||
flags = args.src.read_u8?()
|
||||
// TODO: API for returning the header's MTIME field.
|
||||
args.src.skip!??(n:6)
|
||||
args.src.skip?(n:6)
|
||||
|
||||
// Handle FEXTRA.
|
||||
if (flags & 0x04) != 0 {
|
||||
xlen = args.src.read_u16le!??()
|
||||
args.src.skip!??(n:xlen as base.u32)
|
||||
xlen = args.src.read_u16le?()
|
||||
args.src.skip?(n:xlen as base.u32)
|
||||
}
|
||||
|
||||
// Handle FNAME.
|
||||
@@ -70,7 +70,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 = args.src.read_u8!??()
|
||||
c = args.src.read_u8?()
|
||||
if c == 0 {
|
||||
break
|
||||
}
|
||||
@@ -80,7 +80,7 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
// Handle FCOMMENT.
|
||||
if (flags & 0x10) != 0 {
|
||||
while true {
|
||||
c = args.src.read_u8!??()
|
||||
c = args.src.read_u8?()
|
||||
if c == 0 {
|
||||
break
|
||||
}
|
||||
@@ -89,7 +89,7 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
|
||||
// Handle FHCRC.
|
||||
if (flags & 0x02) != 0 {
|
||||
args.src.skip!??(n:2)
|
||||
args.src.skip?(n:2)
|
||||
}
|
||||
|
||||
// Reserved flags bits must be zero.
|
||||
@@ -100,7 +100,7 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
// Decode and checksum the DEFLATE-encoded payload.
|
||||
while true {
|
||||
args.dst.set_mark!()
|
||||
status =? this.flate.decode!??(dst:args.dst, src:args.src)
|
||||
status =? this.flate.decode?(dst:args.dst, src:args.src)
|
||||
if not this.ignore_checksum {
|
||||
checksum_got = this.checksum.update!(x:args.dst.since_mark())
|
||||
decoded_length_got ~mod+= ((args.dst.since_mark().length() & 0xFFFFFFFF) as base.u32)
|
||||
@@ -110,8 +110,8 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
}
|
||||
yield status
|
||||
}
|
||||
checksum_want = args.src.read_u32le!??()
|
||||
decoded_length_want = args.src.read_u32le!??()
|
||||
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)) {
|
||||
return "?bad checksum"
|
||||
|
||||
Reference in new issue
Block a user