ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-01 12:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert core:compress and core:image error checks to new union comparison.

Browse Source 
No more need for `is_kind(err, Error_Value)`, just test err == Error_Value.
This commit is contained in:
Jeroen van Rijn
2021-05-03 15:08:34 +02:00
parent 357f66fcee
commit 59b3c472ca
8 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compress/gzip/example.odin
+3 -3
View File
@@ -35,7 +35,7 @@ main :: proc() {
if len(args) < 2 {
stderr("No input file specified.\n");
err := gzip.load(TEST, &buf);
if gzip.is_kind(err, gzip.E_General.OK) {
if err != E_General.OK {
stdout("Displaying test vector: ");
stdout(bytes.buffer_to_string(&buf));
stdout("\n");
@@ -54,8 +54,8 @@ main :: proc() {
} else {
err = gzip.load(file, &buf);
}
if !gzip.is_kind(err, gzip.E_General.OK) {
if gzip.is_kind(err, gzip.E_General.File_Not_Found) {
if err != gzip.E_General.OK {
if err != E_General.File_Not_Found {
stderr("File not found: ");
stderr(file);
stderr("\n");
core/compress/gzip/gzip.odin
+1 -2
View File
@@ -94,7 +94,6 @@ E_General :: compress.General_Error;
E_GZIP :: compress.GZIP_Error;
E_ZLIB :: compress.ZLIB_Error;
E_Deflate :: compress.Deflate_Error;
is_kind :: compress.is_kind;
load_from_slice :: proc(slice: []u8, buf: ^bytes.Buffer, allocator := context.allocator) -> (err: Error) {
@@ -278,7 +277,7 @@ load_from_stream :: proc(stream: io.Stream, buf: ^bytes.Buffer, allocator := con
// fmt.printf("ZLIB returned: %v\n", zlib_error);
if !is_kind(zlib_error, E_General.OK) || zlib_error == nil {
if zlib_error != E_General.OK || zlib_error == nil {
return zlib_error;
}