From f9d96d9f73ac090245a518ec04f3fa0e50655d1e Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Sun, 14 Feb 2021 00:49:40 +0000
Subject: Fix most compiler warnings in the boot and code segments (#674)

* Less warnings in boot & code segments

* few more warnings gone

* Ran formatter

* z_view warning gone

* -> 1

* f31 -> 31

* Remove function casts

* Few more small improvements

* Separate declaration and assignment in func_80091738 and Item_Give

Co-authored-by: Thar0 <maximilianc64@gmail.com>
---
 src/libultra_code_O2/__osContAddressCrc.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/libultra_code_O2/__osContAddressCrc.c')

diff --git a/src/libultra_code_O2/__osContAddressCrc.c b/src/libultra_code_O2/__osContAddressCrc.c
index 9b0c779ec..d22668d14 100644
--- a/src/libultra_code_O2/__osContAddressCrc.c
+++ b/src/libultra_code_O2/__osContAddressCrc.c
@@ -17,10 +17,8 @@ u8 __osContAddressCrc(u16 addr) {
             } else {
                 ++ret;
             }
-        } else {
-            if (ret & 0x20) {
-                ret ^= 0x15;
-            }
+        } else if (ret & 0x20) {
+            ret ^= 0x15;
         }
     }
     for (i = 0; i < 5; ++i) {
@@ -29,15 +27,15 @@ u8 __osContAddressCrc(u16 addr) {
             ret ^= 0x15;
         }
     }
+
     return ret & 0x1f;
 }
 
 u8 __osContDataCrc(u8* data) {
-    s32 ret;
+    s32 ret = 0;
     u32 bit;
     u32 byte;
 
-    ret = 0;
     for (byte = 0x20; byte; --byte, ++data) {
         for (bit = 0x80; bit; bit >>= 1) {
             ret <<= 1;
@@ -47,10 +45,8 @@ u8 __osContDataCrc(u8* data) {
                 } else {
                     ++ret;
                 }
-            } else {
-                if (ret & 0x100) {
-                    ret ^= 0x85;
-                }
+            } else if (ret & 0x100) {
+                ret ^= 0x85;
             }
         }
     }
@@ -61,5 +57,6 @@ u8 __osContDataCrc(u8* data) {
         }
         ++byte;
     } while (byte < 8U);
+
     return ret;
 }
-- 
cgit v1.2.3