瀏覽代碼

Minor tweaks to avoid some CodeQL warnings

Ray 1 年之前
父節點
當前提交
401c5a8638
共有 2 個文件被更改,包括 8 次插入19 次删除
  1. 1 1
      src/rcore.c
  2. 7 18
      src/rtext.c

+ 1 - 1
src/rcore.c

@@ -362,7 +362,7 @@ static int screenshotCounter = 0;    // Screenshots counter
 #endif
 
 #if defined(SUPPORT_GIF_RECORDING)
-int gifFrameCounter = 0;             // GIF frames counter
+unsigned int gifFrameCounter = 0;    // GIF frames counter
 bool gifRecording = false;           // GIF recording state
 MsfGifState gifState = { 0 };        // MSGIF context state
 #endif

+ 7 - 18
src/rtext.c

@@ -2264,23 +2264,12 @@ static Font LoadBMFont(const char *fileName)
 #if defined(SUPPORT_FILEFORMAT_BDF)
 
 // Convert hexadecimal to decimal (single digit)
-static char HexToInt(char hex) {
-    if (hex >= '0' && hex <= '9')
-    {
-        return hex - '0';
-    }
-    else if (hex >= 'a' && hex <= 'f')
-    {
-        return hex - 'a' + 10;
-    }
-    else if (hex >= 'A' && hex <= 'F')
-    {
-        return hex - 'A' + 10;
-    }
-    else
-    {
-        return 0;
-    }
+static unsigned char HexToInt(char hex)
+{
+    if (hex >= '0' && hex <= '9') return hex - '0';
+    else if (hex >= 'a' && hex <= 'f') return hex - 'a' + 10;
+    else if (hex >= 'A' && hex <= 'F') return hex - 'A' + 10;
+    else return 0;
 }
 
 // Load font data for further use
@@ -2365,7 +2354,7 @@ static GlyphInfo *LoadFontDataBDF(const unsigned char *fileData, int dataSize, i
 
                     for (int x = 0; x < readBytes; x++)
                     {
-                        char byte = HexToInt(buffer[x]);
+                        unsigned char byte = HexToInt(buffer[x]);
                         
                         for (int bitX = 0; bitX < 4; bitX++)
                         {