Fixed some type mismatches and removed unused vars.

All handles now use Uint32_t in all function in glbapi.cpp
wel97459 · Dec 20, 2024 · ade1742 · ade1742
1 parent b8eefff
commit ade1742
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/src/demo.cpp b/src/demo.cpp
@@ -184,9 +184,7 @@ DEMO_LoadFile(
     void
 )
 {
-    int filesize;
-
-    filesize = GLB_ReadFile(demo_name, 0);
+    GLB_ReadFile(demo_name, 0);
     GLB_ReadFile(demo_name, (char*)playback);
 
     cur_play = 1;

diff --git a/src/gfxapi.cpp b/src/gfxapi.cpp
@@ -1522,7 +1522,7 @@ GFX_StrPixelLen(
 
     for (loop = 0; loop < maxloop; loop++)
     {
-        outlen += infont->width[instr[loop]] + fontspacing;
+        outlen += infont->width[(int)instr[loop]] + fontspacing;
     }
 
     return outlen;

diff --git a/src/glbapi.cpp b/src/glbapi.cpp
@@ -179,7 +179,6 @@ GLB_FindFile(
 	* create a file name and attempt to open it local first, then if it
 	* fails use the exe path and try again.
 	*/
-	int lookat = 0;
 	char *name = (char*)malloc((strlen(prefix)+9) * sizeof(char));
 	sprintf(name, "%s%04u.GLB", prefix, filenum);
 	filename = GLB_FindFilePath(name);
@@ -555,7 +554,7 @@ GLB_FetchItem(
  ***************************************************************************/
 char*
 GLB_CacheItem(
-	int handle
+	uint32_t handle
 )
 {
 	return GLB_FetchItem(handle, FI_CACHE);
@@ -566,7 +565,7 @@ GLB_CacheItem(
  ***************************************************************************/
 char*
 GLB_GetItem(
-	int handle               // INPUT : handle of item
+	uint32_t handle               // INPUT : handle of item
 )
 {
 	return GLB_FetchItem(handle, FI_DISCARD);
@@ -577,7 +576,7 @@ GLB_GetItem(
  ***************************************************************************/
 char*
 GLB_LockItem(
-	int handle
+	uint32_t handle
 )
 {
 	return GLB_FetchItem(handle, FI_LOCK);
@@ -588,7 +587,7 @@ GLB_LockItem(
  ***************************************************************************/
 void
 GLB_UnlockItem(
-	int handle
+	uint32_t handle
 )
 {
 	ITEM_H itm;
@@ -628,7 +627,7 @@ GLB_UnlockItem(
  ***************************************************************************/
 int                        // RETURN: TRUE = Label
 GLB_IsLabel(
-	int handle             // INPUT : handle of item
+	uint32_t handle             // INPUT : handle of item
 )
 {
 	ITEM_H itm;
@@ -653,7 +652,7 @@ GLB_IsLabel(
  ***************************************************************************/
 void
 GLB_ReadItem(
-	int handle,                   // INPUT : handle of item
+	uint32_t handle,                   // INPUT : handle of item
 	char* mem                     // INPUT : pointer to memory
 )
 {
@@ -725,7 +724,7 @@ GLB_GetItemID(
  ***************************************************************************/
 char*                           // RETURN: pointer to item
 GLB_GetPtr(
-	int handle                  // INPUT : handle of item
+	uint32_t handle                  // INPUT : handle of item
 )
 {
 	ITEM_H itm;
@@ -751,7 +750,7 @@ GLB_GetPtr(
  ***************************************************************************/
 void
 GLB_FreeItem(
-	int handle               // INPUT : handle of item
+	uint32_t handle               // INPUT : handle of item
 )
 {
 	ITEM_H itm;
@@ -824,7 +823,7 @@ GLB_FreeAll(
  ***************************************************************************/
 int                               // RETURN: sizeof ITEM
 GLB_ItemSize(
-	int handle                    // INPUT : handle of item
+	uint32_t handle                    // INPUT : handle of item
 )
 {
 	ITEM_H itm;

diff --git a/src/glbapi.h b/src/glbapi.h
@@ -23,22 +23,22 @@ typedef struct
 
 void GLB_UseVM(void);
 int GLB_InitSystem(const char *exepath, int innum, const char *iprefix);
-char *GLB_LockItem(int handle);
-void GLB_UnlockItem(int handle);
-char *GLB_GetItem(int handle);
-char *GLB_CacheItem(int handle);
-void GLB_FreeItem(int handle);
+char *GLB_LockItem(uint32_t handle);
+void GLB_UnlockItem(uint32_t handle);
+char *GLB_GetItem(uint32_t handle);
+char *GLB_CacheItem(uint32_t handle);
+void GLB_FreeItem(uint32_t handle);
 void GLB_FreeAll(void);
 int GLB_GetItemID(const char *in_name);
-int GLB_ItemSize(int handle);
+int GLB_ItemSize(uint32_t handle);
 void GLB_EnCrypt(const char *key, void *buf, int length);
 void GLB_DeCrypt(const char *key, void *buf, int length);
 int GLB_ReadFile(const char *name, char *buffer);
 void GLB_SaveFile(char *name, char *buffer, int length);
 int GLB_Load(char *inmem, int filenum, int itemnum);
-int GLB_IsLabel(int handle);
-void GLB_ReadItem(int handle, char *mem);
+int GLB_IsLabel(uint32_t handle);
+void GLB_ReadItem(uint32_t handle, char *mem);
 char * GLB_FindFilePath(char *file);
-//char *GLB_GetPtr(int handle);
+//char *GLB_GetPtr(uint32_t handle);
 //void GLB_SetItemPointer(int a1, char* a2);
 //void GLB_SetItemSize(int a1, int a2);