From 6d27dbaab3b32ccebb076895fac3cc6aa3240d6c Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Sat, 24 Apr 2021 16:42:52 -0400
Subject: Fix most -Wall warnings (#115)

* started on basic type errors

* Done. For now

* remove libgfxd binary

* Most warnings fixed

* Fix conflicts and new warnings

* Makefile

* Sig

* Clang format

* destructor

* Add a bunch of destructors

* clear the scalars vector after freeing the elements

* PR fixes (Anghelo Alf)

* Fix most clang -Wall warnings
---
 lib/assimp/include/assimp/Bitmap.h | 4 ++--
 lib/libgfxd/README.md              | 6 +++---
 lib/libgfxd/gfxd.c                 | 2 +-
 lib/libgfxd/gfxd.h                 | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/assimp/include/assimp/Bitmap.h b/lib/assimp/include/assimp/Bitmap.h
index e6b5fb1..fafb7ff 100644
--- a/lib/assimp/include/assimp/Bitmap.h
+++ b/lib/assimp/include/assimp/Bitmap.h
@@ -65,7 +65,7 @@ protected:
 
     struct Header {
         uint16_t type;
-        uint32_t size;
+        size_t size;
         uint16_t reserved1;
         uint16_t reserved2;
         uint32_t offset;
@@ -81,7 +81,7 @@ protected:
     };
 
     struct DIB {
-        uint32_t size;
+        size_t size;
         int32_t width;
         int32_t height;
         uint16_t planes;
diff --git a/lib/libgfxd/README.md b/lib/libgfxd/README.md
index 2e82589..f02ffe2 100644
--- a/lib/libgfxd/README.md
+++ b/lib/libgfxd/README.md
@@ -257,21 +257,21 @@ Set the callback function for viewport arguments. The argument type is
 
 ---
 
-##### `typedef int gfxd_uctext_fn_t(uint32_t text, uint32_t size)`
+##### `typedef int gfxd_uctext_fn_t(uint32_t text, size_t size)`
 ##### `void gfxd_uctext_callback(gfxd_uctext_fn_t *fn)`
 Set the callback function for microcode text arguments. The argument type is
 `gfxd_Uctext`. The size of the text segment is in `size`.
 
 ---
 
-##### `typedef int gfxd_ucdata_fn_t(uint32_t data, uint32_t size)`
+##### `typedef int gfxd_ucdata_fn_t(uint32_t data, size_t size)`
 ##### `void gfxd_ucdata_callback(gfxd_ucdata_fn_t *fn)`
 Set the callback function for microcode data arguments. The argument type is
 `gfxd_Ucdata`. The size of the data segment is in `size`.
 
 ---
 
-##### `typedef int gfxd_dram_fn_t(uint32_t dram, uint32_t size)`
+##### `typedef int gfxd_dram_fn_t(uint32_t dram, size_t size)`
 ##### `void gfxd_dram_callback(gfxd_dram_fn_t *fn)`
 Set the callback function for generic pointer arguments. The argument type is
 `gfxd_Dram`. The size of the data is in `size`.
diff --git a/lib/libgfxd/gfxd.c b/lib/libgfxd/gfxd.c
index 76d7ded..22bb2b4 100644
--- a/lib/libgfxd/gfxd.c
+++ b/lib/libgfxd/gfxd.c
@@ -514,7 +514,7 @@ int gfxd_arg_callbacks(int arg_num)
 		{
 			if (config.ucdata_fn != NULL)
 			{
-				uint32_t size;
+				size_t size;
 				if (id == gfxd_SPLoadUcodeEx)
 					size = typed_arg_u(gfxd_Size, 0);
 				else
diff --git a/lib/libgfxd/gfxd.h b/lib/libgfxd/gfxd.h
index 268bbfa..5b3a7dd 100644
--- a/lib/libgfxd/gfxd.h
+++ b/lib/libgfxd/gfxd.h
@@ -335,13 +335,13 @@ void gfxd_vtx_callback(gfxd_vtx_fn_t *fn);
 typedef int gfxd_vp_fn_t(uint32_t vp);
 void gfxd_vp_callback(gfxd_vp_fn_t *fn);
 
-typedef int gfxd_uctext_fn_t(uint32_t text, uint32_t size);
+typedef int gfxd_uctext_fn_t(uint32_t text, size_t size);
 void gfxd_uctext_callback(gfxd_uctext_fn_t *fn);
 
-typedef int gfxd_ucdata_fn_t(uint32_t data, uint32_t size);
+typedef int gfxd_ucdata_fn_t(uint32_t data, size_t size);
 void gfxd_ucdata_callback(gfxd_ucdata_fn_t *fn);
 
-typedef int gfxd_dram_fn_t(uint32_t dram, uint32_t size);
+typedef int gfxd_dram_fn_t(uint32_t dram, size_t size);
 void gfxd_dram_callback(gfxd_dram_fn_t *fn);
 
 int gfxd_write(const void *buf, int count);
-- 
cgit v1.2.3