Add "0x" prefix for hex values in messages

pmqs · Jul 20, 2023 · 3c66d90 · 3c66d90
1 parent cb60c55
commit 3c66d90
Show file tree

Hide file tree

Showing 135 changed files with 234 additions and 229 deletions.
diff --git a/bin/zipdetails b/bin/zipdetails
diff --git a/...rrors/badly-formed/Central-Directory-Header/Offset-not-point-to-Local-Header-zip64/stderr b/...rrors/badly-formed/Central-Directory-Header/Offset-not-point-to-Local-Header-zip64/stderr
@@ -1,3 +1,3 @@
 #
-# FATAL: Offset 0x1: Unexpected Zip Signature '2D04034B [755237707]' at offset 1 [1]
+# FATAL: Offset 0x1: Unexpected Zip Signature '2D04034B [755237707]' at offset 0x1 [1]
 #
diff --git a/...rrors/badly-formed/Central-Directory-Header/Offset-not-point-to-Local-Header-zip64/stdout b/...rrors/badly-formed/Central-Directory-Header/Offset-not-point-to-Local-Header-zip64/stdout
@@ -2,7 +2,7 @@
 # ERROR: Offset 0x184: 'Offset to Local Dir' field in 'Zip64 Extra Field' is invalid
 #        value @ 0x1 should decode to signature for 'Local File Header' (0x04034B50). Got 0x2D04034B
 #
-# INFO: Offset 0x0: found 1 [1] bytes before beginning of zipfile
+# INFO: Offset 0x0: found 0x1 [1] bytes before beginning of zipfile
 #
 
 0000 UNEXPECTED PADDING    P
diff --git a/...ors/badly-formed/Central-Directory-Header/Offset-not-point-to-Local-Header-zip64/stdout-v b/...ors/badly-formed/Central-Directory-Header/Offset-not-point-to-Local-Header-zip64/stdout-v
@@ -2,7 +2,7 @@
 # ERROR: Offset 0x184: 'Offset to Local Dir' field in 'Zip64 Extra Field' is invalid
 #        value @ 0x1 should decode to signature for 'Local File Header' (0x04034B50). Got 0x2D04034B
 #
-# INFO: Offset 0x0: found 1 [1] bytes before beginning of zipfile
+# INFO: Offset 0x0: found 0x1 [1] bytes before beginning of zipfile
 #
 
 0000 0000 0001 50          UNEXPECTED PADDING    P
diff --git a/t/files/0000-errors/badly-formed/Central-Directory-Header/Offset-past-EOF/stderr b/t/files/0000-errors/badly-formed/Central-Directory-Header/Offset-past-EOF/stderr
@@ -1,5 +1,5 @@
 #
 # FATAL: Offset 0xC1: 'Local Header Offset' field in 'Central Directory Header' is invalid
-#        value E6 [230] is 1 [1] bytes past EOF . 
+#        value 0xE6 [230] is 0x1 [1] bytes past EOF . 
 #        Try running with --walk' or '--scan' options . 
 #
diff --git a/t/files/0000-errors/badly-formed/Central-Directory-Header/Offset-past-EOF/stdout--walk--scan b/t/files/0000-errors/badly-formed/Central-Directory-Header/Offset-past-EOF/stdout--walk--scan
@@ -73,7 +73,7 @@
 00C1 Local Header Offset   000000E6 [230]
 #
 # ERROR: Offset 0xC1: 'Local Header Offset' field in 'Central Directory Header' is invalid
-#        value E6 [230] is 1 [1] bytes past EOF
+#        value 0xE6 [230] is 0x1 [1] bytes past EOF
 #
 00C5 Filename              'numbers.txt'
 

diff --git a/...es/0000-errors/badly-formed/Central-Directory-Header/Offset-past-EOF/stdout-v--walk--scan b/...es/0000-errors/badly-formed/Central-Directory-Header/Offset-past-EOF/stdout-v--walk--scan
@@ -81,7 +81,7 @@
 00C1 00C4 0004 E6 00 00 00 Local Header Offset   000000E6 [230]
 #
 # ERROR: Offset 0xC1: 'Local Header Offset' field in 'Central Directory Header' is invalid
-#        value E6 [230] is 1 [1] bytes past EOF
+#        value 0xE6 [230] is 0x1 [1] bytes past EOF
 #
 00C5 00CF 000B 6E 75 6D 62 Filename              'numbers.txt'
                65 72 73 2E

diff --git a/t/files/0000-errors/badly-formed/Central-Directory-Header/Offset-points-forwards/stderr b/t/files/0000-errors/badly-formed/Central-Directory-Header/Offset-points-forwards/stderr
@@ -1,5 +1,5 @@
 #
 # FATAL: Offset 0xC1: 'Local Header Offset' field in 'Central Directory Header' is invalid
-#        value D0 [208] must be less that 97 [151] . 
+#        value 0xD0 [208] must be less that 0x97 [151] . 
 #        Try running with --walk' or '--scan' options . 
 #
diff --git a/...00-errors/badly-formed/Central-Directory-Header/Offset-points-forwards/stdout--walk--scan b/...00-errors/badly-formed/Central-Directory-Header/Offset-points-forwards/stdout--walk--scan
@@ -73,7 +73,7 @@
 00C1 Local Header Offset   000000D0 [208]
 #
 # ERROR: Offset 0xC1: 'Local Header Offset' field in 'Central Directory Header' is invalid
-#        value D0 [208] must be less that 97 [151]
+#        value 0xD0 [208] must be less that 0x97 [151]
 #
 00C5 Filename              'numbers.txt'
 

diff --git a/...-errors/badly-formed/Central-Directory-Header/Offset-points-forwards/stdout-v--walk--scan b/...-errors/badly-formed/Central-Directory-Header/Offset-points-forwards/stdout-v--walk--scan
@@ -81,7 +81,7 @@
 00C1 00C4 0004 D0 00 00 00 Local Header Offset   000000D0 [208]
 #
 # ERROR: Offset 0xC1: 'Local Header Offset' field in 'Central Directory Header' is invalid
-#        value D0 [208] must be less that 97 [151]
+#        value 0xD0 [208] must be less that 0x97 [151]
 #
 00C5 00CF 000B 6E 75 6D 62 Filename              'numbers.txt'
                65 72 73 2E

diff --git a/t/files/0000-errors/badly-formed/Data-Descriptor/header-in-nested-payload/stdout--scan b/t/files/0000-errors/badly-formed/Data-Descriptor/header-in-nested-payload/stdout--scan
@@ -21,7 +21,7 @@
 
 0022 UNEXPECTED PADDING    ....................
 #
-# INFO: Offset 0x22: 14 [20] Unexpected Padding bytes
+# INFO: Offset 0x22: 0x14 [20] Unexpected Padding bytes
 #
 
 0036 CENTRAL HEADER #1     02014B50 [33639248]

diff --git a/t/files/0000-errors/badly-formed/Data-Descriptor/header-in-nested-payload/stdout-v--scan b/t/files/0000-errors/badly-formed/Data-Descriptor/header-in-nested-payload/stdout-v--scan
@@ -30,7 +30,7 @@
                01 02 03 04
                05 06 07 08
 #
-# INFO: Offset 0x22: 14 [20] Unexpected Padding bytes
+# INFO: Offset 0x22: 0x14 [20] Unexpected Padding bytes
 #
 
 0036 0039 0004 50 4B 01 02 CENTRAL HEADER #1     02014B50 [33639248]

diff --git a/t/files/0000-errors/badly-formed/Data-Descriptor/orphan-header/stdout b/t/files/0000-errors/badly-formed/Data-Descriptor/orphan-header/stdout
@@ -15,7 +15,7 @@
 
 0027 UNEXPECTED PADDING
 #
-# INFO: Offset 0x27: 11E [286] Unexpected Padding bytes
+# INFO: Offset 0x27: 0x11E [286] Unexpected Padding bytes
 #
 
 0145 CENTRAL HEADER #1     02014B50 [33639248]

diff --git a/t/files/0000-errors/badly-formed/Data-Descriptor/orphan-header/stdout--walk--scan b/t/files/0000-errors/badly-formed/Data-Descriptor/orphan-header/stdout--walk--scan
@@ -15,7 +15,7 @@
 
 0027 UNEXPECTED PADDING
 #
-# INFO: Offset 0x27: 10E [270] Unexpected Padding bytes
+# INFO: Offset 0x27: 0x10E [270] Unexpected Padding bytes
 #
 
 0135 DATA DESCRIPTOR       08074B50 [134695760]
@@ -28,7 +28,7 @@
 
 0139 UNEXPECTED PADDING    ............
 #
-# INFO: Offset 0x139: C [12] Unexpected Padding bytes
+# INFO: Offset 0x139: 0xC [12] Unexpected Padding bytes
 #
 
 0145 CENTRAL HEADER #1     02014B50 [33639248]

diff --git a/t/files/0000-errors/badly-formed/Data-Descriptor/orphan-header/stdout-v b/t/files/0000-errors/badly-formed/Data-Descriptor/orphan-header/stdout-v
@@ -17,7 +17,7 @@
 
 0027 0144 011E ...         UNEXPECTED PADDING
 #
-# INFO: Offset 0x27: 11E [286] Unexpected Padding bytes
+# INFO: Offset 0x27: 0x11E [286] Unexpected Padding bytes
 #
 
 0145 0148 0004 50 4B 01 02 CENTRAL HEADER #1     02014B50 [33639248]

diff --git a/t/files/0000-errors/badly-formed/Data-Descriptor/orphan-header/stdout-v--walk--scan b/t/files/0000-errors/badly-formed/Data-Descriptor/orphan-header/stdout-v--walk--scan
@@ -17,7 +17,7 @@
 
 0027 0134 010E ...         UNEXPECTED PADDING
 #
-# INFO: Offset 0x27: 10E [270] Unexpected Padding bytes
+# INFO: Offset 0x27: 0x10E [270] Unexpected Padding bytes
 #
 
 0135 0138 0004 50 4B 07 08 DATA DESCRIPTOR       08074B50 [134695760]
@@ -32,7 +32,7 @@
                0E 01 00 00
                BE 01 00 00
 #
-# INFO: Offset 0x139: C [12] Unexpected Padding bytes
+# INFO: Offset 0x139: 0xC [12] Unexpected Padding bytes
 #
 
 0145 0148 0004 50 4B 01 02 CENTRAL HEADER #1     02014B50 [33639248]

diff --git a/t/files/0000-errors/badly-formed/End-of-Central-Directory-Record/Offset-past-EOF/stderr b/t/files/0000-errors/badly-formed/End-of-Central-Directory-Record/Offset-past-EOF/stderr
@@ -1,5 +1,5 @@
 #
 # FATAL: Offset 0xE0: 'Offset to Central Directory' field in 'End Central Directory Record' is invalid
-#        value E6 [230] is 1 [1] bytes past EOF . 
+#        value 0xE6 [230] is 0x1 [1] bytes past EOF . 
 #        Try running with --walk' or '--scan' options . 
 #
diff --git a/...00-errors/badly-formed/End-of-Central-Directory-Record/Offset-past-EOF/stdout--walk--scan b/...00-errors/badly-formed/End-of-Central-Directory-Record/Offset-past-EOF/stdout--walk--scan
@@ -82,7 +82,7 @@
 00E0 Offset to Central Dir 000000E6 [230]
 #
 # ERROR: Offset 0xE0: 'Offset to Central Directory' field in 'End Central Directory Record' is invalid
-#        value E6 [230] is 1 [1] bytes past EOF
+#        value 0xE6 [230] is 0x1 [1] bytes past EOF
 #
 00E4 Comment Length        0000 [0]
 #

diff --git a/...-errors/badly-formed/End-of-Central-Directory-Record/Offset-past-EOF/stdout-v--walk--scan b/...-errors/badly-formed/End-of-Central-Directory-Record/Offset-past-EOF/stdout-v--walk--scan
@@ -92,7 +92,7 @@
 00E0 00E3 0004 E6 00 00 00 Offset to Central Dir 000000E6 [230]
 #
 # ERROR: Offset 0xE0: 'Offset to Central Directory' field in 'End Central Directory Record' is invalid
-#        value E6 [230] is 1 [1] bytes past EOF
+#        value 0xE6 [230] is 0x1 [1] bytes past EOF
 #
 00E4 00E5 0002 00 00       Comment Length        0000 [0]
 #

diff --git a/...es/0000-errors/badly-formed/End-of-Central-Directory-Record/Offset-points-forwards/stderr b/...es/0000-errors/badly-formed/End-of-Central-Directory-Record/Offset-points-forwards/stderr
@@ -1,5 +1,5 @@
 #
 # FATAL: Offset 0xE0: 'Offset to Central Directory' field in 'End Central Directory Record' is invalid
-#        value D1 [209] must be less that D0 [208] . 
+#        value 0xD1 [209] must be less that 0xD0 [208] . 
 #        Try running with --walk' or '--scan' options . 
 #
diff --git a/...rs/badly-formed/End-of-Central-Directory-Record/Offset-points-forwards/stdout--walk--scan b/...rs/badly-formed/End-of-Central-Directory-Record/Offset-points-forwards/stdout--walk--scan
@@ -82,7 +82,7 @@
 00E0 Offset to Central Dir 000000D1 [209]
 #
 # ERROR: Offset 0xE0: 'Offset to Central Directory' field in 'End Central Directory Record' is invalid
-#        value D1 [209] must be less that D0 [208]
+#        value 0xD1 [209] must be less that 0xD0 [208]
 #
 00E4 Comment Length        0000 [0]
 #

diff --git a/.../badly-formed/End-of-Central-Directory-Record/Offset-points-forwards/stdout-v--walk--scan b/.../badly-formed/End-of-Central-Directory-Record/Offset-points-forwards/stdout-v--walk--scan
@@ -92,7 +92,7 @@
 00E0 00E3 0004 D1 00 00 00 Offset to Central Dir 000000D1 [209]
 #
 # ERROR: Offset 0xE0: 'Offset to Central Directory' field in 'End Central Directory Record' is invalid
-#        value D1 [209] must be less that D0 [208]
+#        value 0xD1 [209] must be less that 0xD0 [208]
 #
 00E4 00E5 0002 00 00       Comment Length        0000 [0]
 #

diff --git a/t/files/0000-errors/badly-formed/End-of-Central-Directory-Record/comment/stdout b/t/files/0000-errors/badly-formed/End-of-Central-Directory-Record/comment/stdout
@@ -46,7 +46,7 @@
 006D Comment Length        0013 [19]
 #
 # ERROR: Offset 0x6F: file truncated while reading 'Comment' field in 'End Central Directory Record'
-#        Expected 13 [19] bytes, but only 0 [0] available
+#        Expected 0x13 [19] bytes, but only 0x0 [0] available
 #
 # Error Count: 1
 #

diff --git a/t/files/0000-errors/badly-formed/End-of-Central-Directory-Record/comment/stdout-v b/t/files/0000-errors/badly-formed/End-of-Central-Directory-Record/comment/stdout-v
@@ -47,7 +47,7 @@
 006D 006E 0002 13 00       Comment Length        0013 [19]
 #
 # ERROR: Offset 0x6F: file truncated while reading 'Comment' field in 'End Central Directory Record'
-#        Expected 13 [19] bytes, but only 0 [0] available
+#        Expected 0x13 [19] bytes, but only 0x0 [0] available
 #
 # Error Count: 1
 #

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/at-least/stdout b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/at-least/stdout
@@ -14,7 +14,7 @@
 0026 Extra ID #1           7075 [28789] 'Unicode Path [up]'
 0028   Length              0001 [1]
 #
-# ERROR: Offset 0x28: Extra Field 'Unicode Path [up]' (ID 0x7075): 'Length' field invalid: value must be at least 5 [5], got 1 [1]
+# ERROR: Offset 0x28: Extra Field 'Unicode Path [up]' (ID 0x7075): 'Length' field invalid: value must be at least 0x5 [5], got 0x1 [1]
 #
 002A   Extra Payload       1
 002B PAYLOAD               abcde

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/at-least/stdout-v b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/at-least/stdout-v
@@ -15,7 +15,7 @@
 0026 0027 0002 75 70       Extra ID #1           7075 [28789] 'Unicode Path [up]'
 0028 0029 0002 01 00         Length              0001 [1]
 #
-# ERROR: Offset 0x28: Extra Field 'Unicode Path [up]' (ID 0x7075): 'Length' field invalid: value must be at least 5 [5], got 1 [1]
+# ERROR: Offset 0x28: Extra Field 'Unicode Path [up]' (ID 0x7075): 'Length' field invalid: value must be at least 0x5 [5], got 0x1 [1]
 #
 002A 002A 0001 31            Extra Payload       1
 002B 002F 0005 61 62 63 64 PAYLOAD               abcde

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/between-lower-bound/stdout b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/between-lower-bound/stdout
@@ -14,7 +14,7 @@
 0026 Extra ID #1           5455 [21589] 'Extended Timestamp [UT]'
 0028   Length              0000 [0]
 #
-# ERROR: Offset 0x28: Extra Field 'Extended Timestamp [UT]' (ID 0x5455): 'Length' field invalid: value must be betweem 1 [1] and D [13], got 0 [0]
+# ERROR: Offset 0x28: Extra Field 'Extended Timestamp [UT]' (ID 0x5455): 'Length' field invalid: value must be betweem 0x1 [1] and 0xD [13], got 0x0 [0]
 #
 002A PAYLOAD               abcde
 

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/between-lower-bound/stdout-v b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/between-lower-bound/stdout-v
@@ -15,7 +15,7 @@
 0026 0027 0002 55 54       Extra ID #1           5455 [21589] 'Extended Timestamp [UT]'
 0028 0029 0002 00 00         Length              0000 [0]
 #
-# ERROR: Offset 0x28: Extra Field 'Extended Timestamp [UT]' (ID 0x5455): 'Length' field invalid: value must be betweem 1 [1] and D [13], got 0 [0]
+# ERROR: Offset 0x28: Extra Field 'Extended Timestamp [UT]' (ID 0x5455): 'Length' field invalid: value must be betweem 0x1 [1] and 0xD [13], got 0x0 [0]
 #
 002A 002E 0005 61 62 63 64 PAYLOAD               abcde
                65

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/between-upper-bound/stdout b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/between-upper-bound/stdout
@@ -14,7 +14,7 @@
 0026 Extra ID #1           5855 [22613] 'Unix Extra type 1 [UX]'
 0028   Length              000E [14]
 #
-# ERROR: Offset 0x28: Extra Field 'Unix Extra type 1 [UX]' (ID 0x5855): 'Length' field invalid: expected C [12], got E [14]
+# ERROR: Offset 0x28: Extra Field 'Unix Extra type 1 [UX]' (ID 0x5855): 'Length' field invalid: expected 0xC [12], got 0xE [14]
 #
 002A   Extra Payload       xxxxxxxxxxxxxx
 0038 PAYLOAD               abcde

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/between-upper-bound/stdout-v b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/between-upper-bound/stdout-v
@@ -15,7 +15,7 @@
 0026 0027 0002 55 58       Extra ID #1           5855 [22613] 'Unix Extra type 1 [UX]'
 0028 0029 0002 0E 00         Length              000E [14]
 #
-# ERROR: Offset 0x28: Extra Field 'Unix Extra type 1 [UX]' (ID 0x5855): 'Length' field invalid: expected C [12], got E [14]
+# ERROR: Offset 0x28: Extra Field 'Unix Extra type 1 [UX]' (ID 0x5855): 'Length' field invalid: expected 0xC [12], got 0xE [14]
 #
 002A 0037 000E 78 78 78 78   Extra Payload       xxxxxxxxxxxxxx
                78 78 78 78

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/exactly/stdout b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/exactly/stdout
@@ -14,7 +14,7 @@
 0026 Extra ID #1           9903 [39171] 'Reference'
 0028   Length              0000 [0]
 #
-# ERROR: Offset 0x28: Extra Field 'Reference' (ID 0x9903): 'Length' field invalid: expected 14 [20], got 0 [0]
+# ERROR: Offset 0x28: Extra Field 'Reference' (ID 0x9903): 'Length' field invalid: expected 0x14 [20], got 0x0 [0]
 #
 002A PAYLOAD               abcde
 

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/exactly/stdout-v b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/exactly/stdout-v
@@ -15,7 +15,7 @@
 0026 0027 0002 03 99       Extra ID #1           9903 [39171] 'Reference'
 0028 0029 0002 00 00         Length              0000 [0]
 #
-# ERROR: Offset 0x28: Extra Field 'Reference' (ID 0x9903): 'Length' field invalid: expected 14 [20], got 0 [0]
+# ERROR: Offset 0x28: Extra Field 'Reference' (ID 0x9903): 'Length' field invalid: expected 0x14 [20], got 0x0 [0]
 #
 002A 002E 0005 61 62 63 64 PAYLOAD               abcde
                65

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-overflow/stderr b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-overflow/stderr
@@ -1,3 +1,3 @@
 # FATAL: Offset 0x2E: Internal Error: Overflow processing Extra Field 'DUMMY' (ID 0xFFFF).
-#        Should be at offset 2D [45], actually at 2E [46] 
+#        Should be at offset 0x2D [45], actually at 0x2E [46] 
 #        Please report error at https://github.com/pmqs/zipdetails/issues
diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-too-big/stdout b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-too-big/stdout
@@ -21,7 +21,7 @@
 0036   Length              000C [12]
 #
 # ERROR: Offset 0x36: Extra Field 'Unix Extra type 3 [ux]' (ID 0x7875): 'Length' field invalid
-#        value C [12] > B [11] bytes remaining
+#        value 0xC [12] > 0xB [11] bytes remaining
 #
 0038   Extra Payload       ...........
 0043 PAYLOAD

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-too-big/stdout-v b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-too-big/stdout-v
@@ -23,7 +23,7 @@
 0036 0037 0002 0C 00         Length              000C [12]
 #
 # ERROR: Offset 0x36: Extra Field 'Unix Extra type 3 [ux]' (ID 0x7875): 'Length' field invalid
-#        value C [12] > B [11] bytes remaining
+#        value 0xC [12] > 0xB [11] bytes remaining
 #
 0038 0042 000B 01 04 E8 03   Extra Payload       ...........
                00 00 04 E8

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-underflow/stdout b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-underflow/stdout
@@ -15,8 +15,8 @@
 0028   Length              0005 [5]
 002A   Data                34333231 [875770417]
 #
-# ERROR: Offset 0x2E: Expected to be at offset 2F [47] after processing Extra Field 'DUMMY' (ID 0xFFFF), actually at 2E [46]
-#        Skipping 1 [1] bytes
+# ERROR: Offset 0x2E: Expected to be at offset 0x2F [47] after processing Extra Field 'DUMMY' (ID 0xFFFF), actually at 0x2E [46]
+#        Skipping 0x1 [1] bytes
 #
 002E   Extra Data          5
 002F PAYLOAD               abcde

diff --git a/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-underflow/stdout-v b/t/files/0000-errors/badly-formed/LocalHeader/extra-sizes/xlen-underflow/stdout-v
@@ -16,8 +16,8 @@
 0028 0029 0002 05 00         Length              0005 [5]
 002A 002D 0004 31 32 33 34   Data                34333231 [875770417]
 #
-# ERROR: Offset 0x2E: Expected to be at offset 2F [47] after processing Extra Field 'DUMMY' (ID 0xFFFF), actually at 2E [46]
-#        Skipping 1 [1] bytes
+# ERROR: Offset 0x2E: Expected to be at offset 0x2F [47] after processing Extra Field 'DUMMY' (ID 0xFFFF), actually at 0x2E [46]
+#        Skipping 0x1 [1] bytes
 #
 002E 002E 0001 35            Extra Data          5
 002F 0033 0005 61 62 63 64 PAYLOAD               abcde

diff --git a/t/files/0000-errors/badly-formed/Zip64-End-Central-Locator/Offset-past-EOF/stderr b/t/files/0000-errors/badly-formed/Zip64-End-Central-Locator/Offset-past-EOF/stderr
@@ -1,5 +1,5 @@
 #
 # FATAL: Offset 0x200: 'Offset to Zip64 End of Central Directory Record' field in 'Zip64 End of Central Directory Locator' is invalid
-#        value 222 [546] is 1 [1] bytes past EOF . 
+#        value 0x222 [546] is 0x1 [1] bytes past EOF . 
 #        Try running with --walk' or '--scan' options . 
 #
diff --git a/...les/0000-errors/badly-formed/Zip64-End-Central-Locator/Offset-past-EOF/stdout--walk--scan b/...les/0000-errors/badly-formed/Zip64-End-Central-Locator/Offset-past-EOF/stdout--walk--scan
@@ -89,7 +89,7 @@
 0208 Total no of Disks     00000001 [1]
 #
 # ERROR: Offset 0x200: 'Offset to Zip64 End of Central Directory Record' field in 'Zip64 End of Central Directory Locator' is invalid
-#        value 222 [546] is 1 [1] bytes past EOF
+#        value 0x222 [546] is 0x1 [1] bytes past EOF
 #
 
 020C END CENTRAL HEADER    06054B50 [101010256]

diff --git a/...s/0000-errors/badly-formed/Zip64-End-Central-Locator/Offset-past-EOF/stdout-v--walk--scan b/...s/0000-errors/badly-formed/Zip64-End-Central-Locator/Offset-past-EOF/stdout-v--walk--scan
@@ -102,7 +102,7 @@
 0208 020B 0004 01 00 00 00 Total no of Disks     00000001 [1]
 #
 # ERROR: Offset 0x200: 'Offset to Zip64 End of Central Directory Record' field in 'Zip64 End of Central Directory Locator' is invalid
-#        value 222 [546] is 1 [1] bytes past EOF
+#        value 0x222 [546] is 0x1 [1] bytes past EOF
 #
 
 020C 020F 0004 50 4B 05 06 END CENTRAL HEADER    06054B50 [101010256]

diff --git a/t/files/0000-errors/badly-formed/Zip64-End-Central-Locator/Offset-points-forwards/stderr b/t/files/0000-errors/badly-formed/Zip64-End-Central-Locator/Offset-points-forwards/stderr
@@ -1,5 +1,5 @@
 #
 # FATAL: Offset 0x200: 'Offset to Zip64 End of Central Directory Record' field in 'Zip64 End of Central Directory Locator' is invalid
-#        value 200 [512] must be less that 1F8 [504] . 
+#        value 0x200 [512] must be less that 0x1F8 [504] . 
 #        Try running with --walk' or '--scan' options . 
 #
diff --git a/...0-errors/badly-formed/Zip64-End-Central-Locator/Offset-points-forwards/stdout--walk--scan b/...0-errors/badly-formed/Zip64-End-Central-Locator/Offset-points-forwards/stdout--walk--scan
@@ -89,7 +89,7 @@
 0208 Total no of Disks     00000001 [1]
 #
 # ERROR: Offset 0x200: 'Offset to Zip64 End of Central Directory Record' field in 'Zip64 End of Central Directory Locator' is invalid
-#        value 200 [512] must be less that 1F8 [504]
+#        value 0x200 [512] must be less that 0x1F8 [504]
 #
 
 020C END CENTRAL HEADER    06054B50 [101010256]

diff --git a/...errors/badly-formed/Zip64-End-Central-Locator/Offset-points-forwards/stdout-v--walk--scan b/...errors/badly-formed/Zip64-End-Central-Locator/Offset-points-forwards/stdout-v--walk--scan
@@ -102,7 +102,7 @@
 0208 020B 0004 01 00 00 00 Total no of Disks     00000001 [1]
 #
 # ERROR: Offset 0x200: 'Offset to Zip64 End of Central Directory Record' field in 'Zip64 End of Central Directory Locator' is invalid
-#        value 200 [512] must be less that 1F8 [504]
+#        value 0x200 [512] must be less that 0x1F8 [504]
 #
 
 020C 020F 0004 50 4B 05 06 END CENTRAL HEADER    06054B50 [101010256]

diff --git a/...les/0000-errors/badly-formed/Zip64-End-of-Central-Directory-Record/Offset-past-EOF/stderr b/...les/0000-errors/badly-formed/Zip64-End-of-Central-Directory-Record/Offset-past-EOF/stderr
@@ -1,5 +1,5 @@
 #
 # FATAL: Offset 0x1E4: 'Offset to Central Directory' field in 'Zip64 End of Central Directory Record' is invalid
-#        value 21D [541] is 40 [64] bytes past EOF . 
+#        value 0x21D [541] is 0x40 [64] bytes past EOF . 
 #        Try running with --walk' or '--scan' options . 
 #
diff --git a/...ors/badly-formed/Zip64-End-of-Central-Directory-Record/Offset-past-EOF/stdout--walk--scan b/...ors/badly-formed/Zip64-End-of-Central-Directory-Record/Offset-past-EOF/stdout--walk--scan
@@ -60,7 +60,7 @@
 01AC Offset to Central dir 000000000000021D [541]
 #
 # ERROR: Offset 0x1AC: 'Offset to Central Directory' field in 'Zip64 End of Central Directory Record' is invalid
-#        value 21D [541] is 40 [64] bytes past EOF
+#        value 0x21D [541] is 0x40 [64] bytes past EOF
 #
 
 01B4 ZIP64 END CENTRAL DIR 07064B50 [117853008]