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/osViGetCurrentFramebuffer.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/src/libultra_code_O2/osViGetCurrentFramebuffer.c b/src/libultra_code_O2/osViGetCurrentFramebuffer.c
index f605f1683..f0e4c7443 100644
--- a/src/libultra_code_O2/osViGetCurrentFramebuffer.c
+++ b/src/libultra_code_O2/osViGetCurrentFramebuffer.c
@@ -1,12 +1,10 @@
 #include "global.h"
 
-u32* osViGetCurrentFramebuffer() {
-    register u32 sMask = __osDisableInt();
-    u32* var1;
+u32* osViGetCurrentFramebuffer(void) {
+    register u32 prevInt = __osDisableInt();
+    u32* var1 = __osViCurr->buffer;
 
-    var1 = __osViCurr->buffer;
-
-    __osRestoreInt(sMask);
+    __osRestoreInt(prevInt);
 
     return var1;
 }
-- 
cgit v1.2.3