Place more vars at the top of functions

This commit is contained in:
Nigel Tao committed 2018-12-26 19:14:07 +11:00
1 parent bac74a830d
commit 25776a724e
4 files changed
+38 -15

No files matched your search

+15 -8
View File
@@ -31,8 +31,17 @@ pub func decoder.set_ignore_checksum!(ic base.bool) {
}
pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
var c base.u8
var flags base.u8
var xlen base.u16
var checksum_got base.u32
var decoded_length_got base.u32
var z base.status
var checksum_want base.u32
var decoded_length_want base.u32
// Read the header.
var c base.u8 = args.src.read_u8!??()
c = args.src.read_u8!??()
if c != 0x1F {
return "?bad header"
}
@@ -44,13 +53,13 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
if c != 0x08 {
return "?bad compression method"
}
var flags base.u8 = args.src.read_u8!??()
flags = args.src.read_u8!??()
// TODO: API for returning the header's MTIME field.
args.src.skip!??(n:6)
// Handle FEXTRA.
if (flags & 0x04) != 0 {
var xlen base.u16 = args.src.read_u16le!??()
xlen = args.src.read_u16le!??()
args.src.skip!??(n:xlen as base.u32)
}
@@ -89,11 +98,9 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
}
// Decode and checksum the DEFLATE-encoded payload.
var checksum_got base.u32
var decoded_length_got base.u32
while true {
args.dst.set_mark!()
var z base.status =? this.flate.decode!??(dst:args.dst, src:args.src)
z =? 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)
@@ -103,8 +110,8 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
}
yield z
}
var checksum_want base.u32 = args.src.read_u32le!??()
var decoded_length_want base.u32 = 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"