Remove some redundancy in error messages

This commit is contained in:
Nigel Tao committed 2018-05-03 11:51:55 +10:00
1 parent 37ca5e8504
commit ee777d66c5
13 files changed
+97 -101

No files matched your search

+2 -2
View File
@@ -20,9 +20,9 @@ pub error "bad Huffman code length count"
pub error "bad Huffman code length repetition"
pub error "bad Huffman code"
pub error "bad Huffman minimum code length"
pub error "bad block"
pub error "bad distance"
pub error "bad distance code count"
pub error "bad flate block"
pub error "bad literal/length code count"
pub error "inconsistent stored block length"
pub error "missing end-of-block code"
@@ -195,7 +195,7 @@ pri func decoder.decode_blocks?(dst base.io_writer, src base.io_reader)() {
} else if type == 2 {
this.init_dynamic_huffman?(src:in.src)
} else {
return error "bad flate block"
return error "bad block"
}
this.end_of_block = false
+7 -7
View File
@@ -14,10 +14,10 @@
packageid "gif "
pub error "bad GIF block"
pub error "bad GIF extension label"
pub error "bad GIF header"
pub error "bad LZW literal width"
pub error "bad block"
pub error "bad extension label"
pub error "bad header"
pub error "bad literal width"
pub struct decoder?(
width base.u32[..65535],
@@ -107,7 +107,7 @@ pub func decoder.decode_frame?(dst base.io_writer, src base.io_reader)() {
} else if this.block_type == 0x3B { // The spec calls 0x3B the "Trailer".
break
} else {
return error "bad GIF block"
return error "bad block"
}
}
@@ -128,7 +128,7 @@ pri func decoder.decode_header?(src base.io_reader)() {
}
if (c[0] != 0x47) or (c[1] != 0x49) or (c[2] != 0x46) or (c[3] != 0x38) or
((c[4] != 0x37) and (c[4] != 0x39)) or (c[5] != 0x61) {
return error "bad GIF header"
return error "bad header"
}
}
@@ -300,7 +300,7 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() {
var lw base.u8 = in.src.read_u8?()
if (lw < 2) or (8 < lw) {
return error "bad LZW literal width"
return error "bad literal width"
}
this.lzw.set_literal_width!(lw:lw as base.u32)
+7 -7
View File
@@ -17,10 +17,10 @@ packageid "gzip"
use "std/crc32"
use "std/deflate"
pub error "bad gzip header"
pub error "bad header"
pub error "checksum mismatch"
pub error "invalid gzip compression method"
pub error "invalid gzip encoding flags"
pub error "invalid compression method"
pub error "invalid encoding flags"
pub struct decoder?(
flate deflate.decoder,
@@ -35,13 +35,13 @@ pub func decoder.set_ignore_checksum!(ic base.bool)() {
pub func decoder.decode?(dst base.io_writer, src base.io_reader)() {
// Read the header.
if in.src.read_u8?() != 0x1F {
return error "bad gzip header"
return error "bad header"
}
if in.src.read_u8?() != 0x8B {
return error "bad gzip header"
return error "bad header"
}
if in.src.read_u8?() != 0x08 {
return error "invalid gzip compression method"
return error "invalid compression method"
}
var flags base.u8 = in.src.read_u8?()
// TODO: API for returning the header's MTIME field.
@@ -85,7 +85,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader)() {
// Reserved flags bits must be zero.
if (flags & 0xE0) != 0 {
return error "invalid gzip encoding flags"
return error "invalid encoding flags"
}
// Decode and checksum the DEFLATE-encoded payload.
+8 -8
View File
@@ -18,11 +18,11 @@ use "std/adler32"
use "std/deflate"
pub error "checksum mismatch"
pub error "invalid zlib compression method"
pub error "invalid zlib compression window size"
pub error "invalid zlib parity check"
pub error "invalid compression method"
pub error "invalid compression window size"
pub error "invalid parity check"
pub error "TODO: unsupported zlib preset dictionary"
pub error "TODO: unsupported preset dictionary"
pub struct decoder?(
flate deflate.decoder,
@@ -37,16 +37,16 @@ pub func decoder.set_ignore_checksum!(ic base.bool)() {
pub func decoder.decode?(dst base.io_writer, src base.io_reader)() {
var x base.u16 = in.src.read_u16be?()
if ((x >> 8) & 0x0F) != 0x08 {
return error "invalid zlib compression method"
return error "invalid compression method"
}
if (x >> 12) > 0x07 {
return error "invalid zlib compression window size"
return error "invalid compression window size"
}
if (x & 0x20) != 0 {
return error "TODO: unsupported zlib preset dictionary"
return error "TODO: unsupported preset dictionary"
}
if (x % 31) != 0 {
return error "invalid zlib parity check"
return error "invalid parity check"
}
// Decode and checksum the DEFLATE-encoded payload.