RENAMED: Variable names for consistency, textLength (length in bytes) vs textSize (measure in pixels)

raysan5 · raysan5 · commit b465b4e2eafe · 2025-12-11T21:41:25.000+01:00
diff --git a/src/raudio.c b/src/raudio.c
@@ -2770,9 +2770,9 @@ static const char *GetFileNameWithoutExt(const char *filePath)
 
     if (filePath != NULL) strncpy(fileName, GetFileName(filePath), MAX_FILENAMEWITHOUTEXT_LENGTH - 1); // Get filename with extension
 
-    int size = (int)strlen(fileName);   // Get size in bytes
+    int fileNameLength = (int)strlen(fileName); // Get size in bytes
 
-    for (int i = 0; (i < size) && (i < MAX_FILENAMEWITHOUTEXT_LENGTH); i++)
+    for (int i = 0; (i < fileNameLength) && (i < MAX_FILENAMEWITHOUTEXT_LENGTH); i++)
     {
         if (fileName[i] == '.')
         {
diff --git a/src/rcore.c b/src/rcore.c
@@ -2009,24 +2009,24 @@ bool IsFileExtension(const char *fileName, const char *ext)
 
     if (fileExt != NULL)
     {
-        int fileExtLen = (int)strlen(fileExt);
+        int fileExtLength = (int)strlen(fileExt);
         char fileExtLower[16] = { 0 };
         char *fileExtLowerPtr = fileExtLower;
-        for (int i = 0; (i < fileExtLen) && (i < 16); i++)
+        for (int i = 0; (i < fileExtLength) && (i < 16); i++)
         {
             // Copy and convert to lower-case
             if ((fileExt[i] >= 'A') && (fileExt[i] <= 'Z')) fileExtLower[i] =  fileExt[i] + 32;
             else fileExtLower[i] =  fileExt[i];
         }
 
         int extCount = 1;
-        int extLen = (int)strlen(ext);
-        char *extList = (char *)RL_CALLOC(extLen + 1, 1);
+        int extLength = (int)strlen(ext);
+        char *extList = (char *)RL_CALLOC(extLength + 1, 1);
         char *extListPtrs[MAX_FILE_EXTENSIONS] = { 0 };
-        strncpy(extList, ext, extLen);
+        strncpy(extList, ext, extLength);
         extListPtrs[0] = extList;
 
-        for (int i = 0; i < extLen; i++)
+        for (int i = 0; i < extLength; i++)
         {
             // Convert to lower-case if extension is upper-case
             if ((extList[i] >= 'A') && (extList[i] <= 'Z')) extList[i] += 32;
@@ -2163,9 +2163,9 @@ const char *GetFileNameWithoutExt(const char *filePath)
     if (filePath != NULL)
     {
         strncpy(fileName, GetFileName(filePath), MAX_FILENAME_LENGTH - 1); // Get filename.ext without path
-        int size = (int)strlen(fileName); // Get size in bytes
+        int fileNameLenght = (int)strlen(fileName); // Get size in bytes
 
-        for (int i = size; i > 0; i--) // Reverse search '.'
+        for (int i = fileNameLenght; i > 0; i--) // Reverse search '.'
         {
             if (fileName[i] == '.')
             {
@@ -2232,11 +2232,11 @@ const char *GetPrevDirectoryPath(const char *dirPath)
 {
     static char prevDirPath[MAX_FILEPATH_LENGTH] = { 0 };
     memset(prevDirPath, 0, MAX_FILEPATH_LENGTH);
-    int pathLen = (int)strlen(dirPath);
+    int dirPathLength = (int)strlen(dirPath);
 
-    if (pathLen <= 3) strncpy(prevDirPath, dirPath, MAX_FILEPATH_LENGTH  - 1);
+    if (dirPathLength <= 3) strncpy(prevDirPath, dirPath, MAX_FILEPATH_LENGTH  - 1);
 
-    for (int i = (pathLen - 1); (i >= 0) && (pathLen > 3); i--)
+    for (int i = (dirPathLength - 1); (i >= 0) && (dirPathLength > 3); i--)
     {
         if ((dirPath[i] == '\\') || (dirPath[i] == '/'))
         {
@@ -2323,8 +2323,8 @@ const char *GetApplicationDirectory(void)
 
     if (_NSGetExecutablePath(appDir, &size) == 0)
     {
-        int len = strlen(appDir);
-        for (int i = len; i >= 0; --i)
+        int appDirLength = (int)strlen(appDir);
+        for (int i = appDirLength; i >= 0; --i)
         {
             if (appDir[i] == '/')
             {
@@ -2346,8 +2346,8 @@ const char *GetApplicationDirectory(void)
 
     if (sysctl(mib, 4, appDir, &size, NULL, 0) == 0)
     {
-        int len = strlen(appDir);
-        for (int i = len; i >= 0; --i)
+        int appDirLength = (int)strlen(appDir);
+        for (int i = appDirLength; i >= 0; --i)
         {
             if (appDir[i] == '/')
             {
@@ -2442,12 +2442,12 @@ int MakeDirectory(const char *dirPath)
     if (DirectoryExists(dirPath)) return 0; // Path already exists (is valid)
 
     // Copy path string to avoid modifying original
-    int len = (int)strlen(dirPath) + 1;
-    char *pathcpy = (char *)RL_CALLOC(len, 1);
-    memcpy(pathcpy, dirPath, len);
+    int dirPathLength = (int)strlen(dirPath) + 1;
+    char *pathcpy = (char *)RL_CALLOC(dirPathLength, 1);
+    memcpy(pathcpy, dirPath, dirPathLength);
 
     // Iterate over pathcpy, create each subdirectory as needed
-    for (int i = 0; (i < len) && (pathcpy[i] != '\0'); i++)
+    for (int i = 0; (i < dirPathLength) && (pathcpy[i] != '\0'); i++)
     {
         if (pathcpy[i] == ':') i++;
         else
@@ -2499,10 +2499,10 @@ bool IsFileNameValid(const char *fileName)
 
     if ((fileName != NULL) && (fileName[0] != '\0'))
     {
-        int length = (int)strlen(fileName);
+        int fileNameLength = (int)strlen(fileName);
         bool allPeriods = true;
 
-        for (int i = 0; i < length; i++)
+        for (int i = 0; i < fileNameLength; i++)
         {
             // Check invalid characters
             if ((fileName[i] == '<') ||
@@ -2528,15 +2528,15 @@ bool IsFileNameValid(const char *fileName)
         if (valid)
         {
             // Check invalid DOS names
-            if (length >= 3)
+            if (fileNameLength >= 3)
             {
                 if (((fileName[0] == 'C') && (fileName[1] == 'O') && (fileName[2] == 'N')) ||   // CON
                     ((fileName[0] == 'P') && (fileName[1] == 'R') && (fileName[2] == 'N')) ||   // PRN
                     ((fileName[0] == 'A') && (fileName[1] == 'U') && (fileName[2] == 'X')) ||   // AUX
                     ((fileName[0] == 'N') && (fileName[1] == 'U') && (fileName[2] == 'L'))) valid = false; // NUL
             }
 
-            if (length >= 4)
+            if (fileNameLength >= 4)
             {
                 if (((fileName[0] == 'C') && (fileName[1] == 'O') && (fileName[2] == 'M') && ((fileName[3] >= '0') && (fileName[3] <= '9'))) ||  // COM0-9
                     ((fileName[0] == 'L') && (fileName[1] == 'P') && (fileName[2] == 'T') && ((fileName[3] >= '0') && (fileName[3] <= '9')))) valid = false; // LPT0-9
diff --git a/src/rlgl.h b/src/rlgl.h
@@ -2496,12 +2496,12 @@ void rlLoadExtensions(void *loader)
     const char *extensions = (const char *)glGetString(GL_EXTENSIONS);  // One big const string
 
     // NOTE: We have to duplicate string because glGetString() returns a const string
-    int extSize = (int)strlen(extensions); // Get extensions string size in bytes
-    char *extensionsDup = (char *)RL_CALLOC(extSize + 1, sizeof(char)); // Allocate space for copy with additional EOL byte
-    strncpy(extensionsDup, extensions, extSize);
+    int extensionsLength = (int)strlen(extensions); // Get extensions string size in bytes
+    char *extensionsDup = (char *)RL_CALLOC(extensionsLength + 1, sizeof(char)); // Allocate space for copy with additional EOL byte
+    strncpy(extensionsDup, extensions, extensionsLength);
     extList[numExt] = extensionsDup;
 
-    for (int i = 0; i < extSize; i++)
+    for (int i = 0; i < extensionsLength; i++)
     {
         if (extensionsDup[i] == ' ')
         {
diff --git a/src/rtext.c b/src/rtext.c
@@ -1449,17 +1449,17 @@ char **LoadTextLines(const char *text, int *count)
 
     if (text != NULL)
     {
-        int textSize = TextLength(text);
+        int textLength = TextLength(text);
         lineCount = 1;
 
         // First text scan pass to get required line count
-        for (int i = 0; i < textSize; i++)
+        for (int i = 0; i < textLength; i++)
         {
             if (text[i] == '\n') lineCount++;
         }
 
         lines = (char **)RL_CALLOC(lineCount, sizeof(char *));
-        for (int i = 0, l = 0, lineLen = 0; i <= textSize; i++)
+        for (int i = 0, l = 0, lineLen = 0; i <= textLength; i++)
         {
             if ((text[i] == '\n') || (text[i] == '\0'))
             {
diff --git a/src/rtextures.c b/src/rtextures.c
@@ -1488,7 +1488,7 @@ Image ImageTextEx(Font font, const char *text, float fontSize, float spacing, Co
 #if defined(SUPPORT_MODULE_RTEXT)
     if (text == NULL) return imText;
     
-    int size = (int)strlen(text);   // Get size in bytes of text
+    int textLength = (int)strlen(text); // Get length of text in bytes
     int textOffsetX = 0;            // Image drawing position X
     int textOffsetY = 0;            // Offset between lines (on linebreak '\n')
 
@@ -1499,7 +1499,7 @@ Image ImageTextEx(Font font, const char *text, float fontSize, float spacing, Co
     // Create image to store text
     imText = GenImageColor((int)imSize.x, (int)imSize.y, BLANK);
 
-    for (int i = 0; i < size;)
+    for (int i = 0; i < textLength;)
     {
         // Get next codepoint from byte string and glyph index in font
         int codepointByteCount = 0;
diff --git a/src/utils.c b/src/utils.c
@@ -142,8 +142,8 @@ void TraceLog(int logType, const char *text, ...)
         default: break;
     }
 
-    unsigned int textSize = (unsigned int)strlen(text);
-    memcpy(buffer + strlen(buffer), text, (textSize < (MAX_TRACELOG_MSG_LENGTH - 12))? textSize : (MAX_TRACELOG_MSG_LENGTH - 12));
+    unsigned int textLength = (unsigned int)strlen(text);
+    memcpy(buffer + strlen(buffer), text, (textLength < (MAX_TRACELOG_MSG_LENGTH - 12))? textLength : (MAX_TRACELOG_MSG_LENGTH - 12));
     strcat(buffer, "\n");
     vprintf(buffer, args);
     fflush(stdout);

Original file line number	Diff line number	Diff line change
`@@ -2770,9 +2770,9 @@ static const char GetFileNameWithoutExt(const char filePath)`
`2770`	`2770`
`2771`	`2771`	`if (filePath != NULL) strncpy(fileName, GetFileName(filePath), MAX_FILENAMEWITHOUTEXT_LENGTH - 1); // Get filename with extension`
`2772`	`2772`
`2773`		`- int size = (int)strlen(fileName); // Get size in bytes`
	`2773`	`+ int fileNameLength = (int)strlen(fileName); // Get size in bytes`
`2774`	`2774`
`2775`		`- for (int i = 0; (i < size) && (i < MAX_FILENAMEWITHOUTEXT_LENGTH); i++)`
	`2775`	`+ for (int i = 0; (i < fileNameLength) && (i < MAX_FILENAMEWITHOUTEXT_LENGTH); i++)`
`2776`	`2776`	`{`
`2777`	`2777`	`if (fileName[i] == '.')`
`2778`	`2778`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2009,24 +2009,24 @@ bool IsFileExtension(const char fileName, const char ext)`
`2009`	`2009`
`2010`	`2010`	`if (fileExt != NULL)`
`2011`	`2011`	`{`
`2012`		`- int fileExtLen = (int)strlen(fileExt);`
	`2012`	`+ int fileExtLength = (int)strlen(fileExt);`
`2013`	`2013`	`char fileExtLower[16] = { 0 };`
`2014`	`2014`	`char *fileExtLowerPtr = fileExtLower;`
`2015`		`- for (int i = 0; (i < fileExtLen) && (i < 16); i++)`
	`2015`	`+ for (int i = 0; (i < fileExtLength) && (i < 16); i++)`
`2016`	`2016`	`{`
`2017`	`2017`	`// Copy and convert to lower-case`
`2018`	`2018`	`if ((fileExt[i] >= 'A') && (fileExt[i] <= 'Z')) fileExtLower[i] = fileExt[i] + 32;`
`2019`	`2019`	`else fileExtLower[i] = fileExt[i];`
`2020`	`2020`	`}`
`2021`	`2021`
`2022`	`2022`	`int extCount = 1;`
`2023`		`- int extLen = (int)strlen(ext);`
`2024`		`- char extList = (char )RL_CALLOC(extLen + 1, 1);`
	`2023`	`+ int extLength = (int)strlen(ext);`
	`2024`	`+ char extList = (char )RL_CALLOC(extLength + 1, 1);`
`2025`	`2025`	`char *extListPtrs[MAX_FILE_EXTENSIONS] = { 0 };`
`2026`		`- strncpy(extList, ext, extLen);`
	`2026`	`+ strncpy(extList, ext, extLength);`
`2027`	`2027`	`extListPtrs[0] = extList;`
`2028`	`2028`
`2029`		`- for (int i = 0; i < extLen; i++)`
	`2029`	`+ for (int i = 0; i < extLength; i++)`
`2030`	`2030`	`{`
`2031`	`2031`	`// Convert to lower-case if extension is upper-case`
`2032`	`2032`	`if ((extList[i] >= 'A') && (extList[i] <= 'Z')) extList[i] += 32;`
`@@ -2163,9 +2163,9 @@ const char GetFileNameWithoutExt(const char filePath)`
`2163`	`2163`	`if (filePath != NULL)`
`2164`	`2164`	`{`
`2165`	`2165`	`strncpy(fileName, GetFileName(filePath), MAX_FILENAME_LENGTH - 1); // Get filename.ext without path`
`2166`		`- int size = (int)strlen(fileName); // Get size in bytes`
	`2166`	`+ int fileNameLenght = (int)strlen(fileName); // Get size in bytes`
`2167`	`2167`
`2168`		`- for (int i = size; i > 0; i--) // Reverse search '.'`
	`2168`	`+ for (int i = fileNameLenght; i > 0; i--) // Reverse search '.'`
`2169`	`2169`	`{`
`2170`	`2170`	`if (fileName[i] == '.')`
`2171`	`2171`	`{`
`@@ -2232,11 +2232,11 @@ const char GetPrevDirectoryPath(const char dirPath)`
`2232`	`2232`	`{`
`2233`	`2233`	`static char prevDirPath[MAX_FILEPATH_LENGTH] = { 0 };`
`2234`	`2234`	`memset(prevDirPath, 0, MAX_FILEPATH_LENGTH);`
`2235`		`- int pathLen = (int)strlen(dirPath);`
	`2235`	`+ int dirPathLength = (int)strlen(dirPath);`
`2236`	`2236`
`2237`		`- if (pathLen <= 3) strncpy(prevDirPath, dirPath, MAX_FILEPATH_LENGTH - 1);`
	`2237`	`+ if (dirPathLength <= 3) strncpy(prevDirPath, dirPath, MAX_FILEPATH_LENGTH - 1);`
`2238`	`2238`
`2239`		`- for (int i = (pathLen - 1); (i >= 0) && (pathLen > 3); i--)`
	`2239`	`+ for (int i = (dirPathLength - 1); (i >= 0) && (dirPathLength > 3); i--)`
`2240`	`2240`	`{`
`2241`	`2241`	`if ((dirPath[i] == '\\') \|\| (dirPath[i] == '/'))`
`2242`	`2242`	`{`
`@@ -2323,8 +2323,8 @@ const char *GetApplicationDirectory(void)`
`2323`	`2323`
`2324`	`2324`	`if (_NSGetExecutablePath(appDir, &size) == 0)`
`2325`	`2325`	`{`
`2326`		`- int len = strlen(appDir);`
`2327`		`- for (int i = len; i >= 0; --i)`
	`2326`	`+ int appDirLength = (int)strlen(appDir);`
	`2327`	`+ for (int i = appDirLength; i >= 0; --i)`
`2328`	`2328`	`{`
`2329`	`2329`	`if (appDir[i] == '/')`
`2330`	`2330`	`{`
`@@ -2346,8 +2346,8 @@ const char *GetApplicationDirectory(void)`
`2346`	`2346`
`2347`	`2347`	`if (sysctl(mib, 4, appDir, &size, NULL, 0) == 0)`
`2348`	`2348`	`{`
`2349`		`- int len = strlen(appDir);`
`2350`		`- for (int i = len; i >= 0; --i)`
	`2349`	`+ int appDirLength = (int)strlen(appDir);`
	`2350`	`+ for (int i = appDirLength; i >= 0; --i)`
`2351`	`2351`	`{`
`2352`	`2352`	`if (appDir[i] == '/')`
`2353`	`2353`	`{`
`@@ -2442,12 +2442,12 @@ int MakeDirectory(const char *dirPath)`
`2442`	`2442`	`if (DirectoryExists(dirPath)) return 0; // Path already exists (is valid)`
`2443`	`2443`
`2444`	`2444`	`// Copy path string to avoid modifying original`
`2445`		`- int len = (int)strlen(dirPath) + 1;`
`2446`		`- char pathcpy = (char )RL_CALLOC(len, 1);`
`2447`		`- memcpy(pathcpy, dirPath, len);`
	`2445`	`+ int dirPathLength = (int)strlen(dirPath) + 1;`
	`2446`	`+ char pathcpy = (char )RL_CALLOC(dirPathLength, 1);`
	`2447`	`+ memcpy(pathcpy, dirPath, dirPathLength);`
`2448`	`2448`
`2449`	`2449`	`// Iterate over pathcpy, create each subdirectory as needed`
`2450`		`- for (int i = 0; (i < len) && (pathcpy[i] != '\0'); i++)`
	`2450`	`+ for (int i = 0; (i < dirPathLength) && (pathcpy[i] != '\0'); i++)`
`2451`	`2451`	`{`
`2452`	`2452`	`if (pathcpy[i] == ':') i++;`
`2453`	`2453`	`else`
`@@ -2499,10 +2499,10 @@ bool IsFileNameValid(const char *fileName)`
`2499`	`2499`
`2500`	`2500`	`if ((fileName != NULL) && (fileName[0] != '\0'))`
`2501`	`2501`	`{`
`2502`		`- int length = (int)strlen(fileName);`
	`2502`	`+ int fileNameLength = (int)strlen(fileName);`
`2503`	`2503`	`bool allPeriods = true;`
`2504`	`2504`
`2505`		`- for (int i = 0; i < length; i++)`
	`2505`	`+ for (int i = 0; i < fileNameLength; i++)`
`2506`	`2506`	`{`
`2507`	`2507`	`// Check invalid characters`
`2508`	`2508`	`if ((fileName[i] == '<') \|\|`
`@@ -2528,15 +2528,15 @@ bool IsFileNameValid(const char *fileName)`
`2528`	`2528`	`if (valid)`
`2529`	`2529`	`{`
`2530`	`2530`	`// Check invalid DOS names`
`2531`		`- if (length >= 3)`
	`2531`	`+ if (fileNameLength >= 3)`
`2532`	`2532`	`{`
`2533`	`2533`	`if (((fileName[0] == 'C') && (fileName[1] == 'O') && (fileName[2] == 'N')) \|\| // CON`
`2534`	`2534`	`((fileName[0] == 'P') && (fileName[1] == 'R') && (fileName[2] == 'N')) \|\| // PRN`
`2535`	`2535`	`((fileName[0] == 'A') && (fileName[1] == 'U') && (fileName[2] == 'X')) \|\| // AUX`
`2536`	`2536`	`((fileName[0] == 'N') && (fileName[1] == 'U') && (fileName[2] == 'L'))) valid = false; // NUL`
`2537`	`2537`	`}`
`2538`	`2538`
`2539`		`- if (length >= 4)`
	`2539`	`+ if (fileNameLength >= 4)`
`2540`	`2540`	`{`
`2541`	`2541`	`if (((fileName[0] == 'C') && (fileName[1] == 'O') && (fileName[2] == 'M') && ((fileName[3] >= '0') && (fileName[3] <= '9'))) \|\| // COM0-9`
`2542`	`2542`	`((fileName[0] == 'L') && (fileName[1] == 'P') && (fileName[2] == 'T') && ((fileName[3] >= '0') && (fileName[3] <= '9')))) valid = false; // LPT0-9`
Original file line number	Diff line number	Diff line change
`@@ -1449,17 +1449,17 @@ char *LoadTextLines(const char text, int *count)`
`1449`	`1449`
`1450`	`1450`	`if (text != NULL)`
`1451`	`1451`	`{`
`1452`		`- int textSize = TextLength(text);`
	`1452`	`+ int textLength = TextLength(text);`
`1453`	`1453`	`lineCount = 1;`
`1454`	`1454`
`1455`	`1455`	`// First text scan pass to get required line count`
`1456`		`- for (int i = 0; i < textSize; i++)`
	`1456`	`+ for (int i = 0; i < textLength; i++)`
`1457`	`1457`	`{`
`1458`	`1458`	`if (text[i] == '\n') lineCount++;`
`1459`	`1459`	`}`
`1460`	`1460`
`1461`	`1461`	`lines = (char *)RL_CALLOC(lineCount, sizeof(char ));`
`1462`		`- for (int i = 0, l = 0, lineLen = 0; i <= textSize; i++)`
	`1462`	`+ for (int i = 0, l = 0, lineLen = 0; i <= textLength; i++)`
`1463`	`1463`	`{`
`1464`	`1464`	`if ((text[i] == '\n') \|\| (text[i] == '\0'))`
`1465`	`1465`	`{`