From 03710c9d8ea5acb04445ce3d125b58da043df6ed Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Sat, 22 May 2021 16:54:04 +0200
Subject: [PATCH] Some code tweaks for consistency
---
src/core.c | 12 ++++++------
src/models.c | 22 +++++++++++-----------
src/raylib.h | 6 +++---
src/rlgl.h | 4 ++--
src/text.c | 2 +-
src/utils.c | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/core.c b/src/core.c
index c59245950..e84d82c49 100644
--- a/src/core.c
+++ b/src/core.c
@@ -2179,8 +2179,8 @@ Shader LoadShader(const char *vsFileName, const char *fsFileName)
shader.id = rlLoadShaderCode(vShaderStr, fShaderStr);
- if (vShaderStr != NULL) RL_FREE(vShaderStr);
- if (fShaderStr != NULL) RL_FREE(fShaderStr);
+ if (vShaderStr != NULL) UnloadFileText(vShaderStr);
+ if (fShaderStr != NULL) UnloadFileText(fShaderStr);
// After shader loading, we TRY to set default location names
if (shader.id > 0)
@@ -2801,8 +2801,8 @@ char **GetDirectoryFiles(const char *dirPath, int *fileCount)
ClearDirectoryFiles();
// Memory allocation for MAX_DIRECTORY_FILES
- dirFilesPath = (char **)RL_MALLOC(sizeof(char *)*MAX_DIRECTORY_FILES);
- for (int i = 0; i < MAX_DIRECTORY_FILES; i++) dirFilesPath[i] = (char *)RL_MALLOC(sizeof(char)*MAX_FILEPATH_LENGTH);
+ dirFilesPath = (char **)RL_MALLOC(MAX_DIRECTORY_FILES*sizeof(char *));
+ for (int i = 0; i < MAX_DIRECTORY_FILES; i++) dirFilesPath[i] = (char *)RL_MALLOC(MAX_FILEPATH_LENGTH*sizeof(char));
int counter = 0;
struct dirent *entity;
@@ -5151,11 +5151,11 @@ static void WindowDropCallback(GLFWwindow *window, int count, const char **paths
{
ClearDroppedFiles();
- CORE.Window.dropFilesPath = (char **)RL_MALLOC(sizeof(char *)*count);
+ CORE.Window.dropFilesPath = (char **)RL_MALLOC(count*sizeof(char *));
for (int i = 0; i < count; i++)
{
- CORE.Window.dropFilesPath[i] = (char *)RL_MALLOC(sizeof(char)*MAX_FILEPATH_LENGTH);
+ CORE.Window.dropFilesPath[i] = (char *)RL_MALLOC(MAX_FILEPATH_LENGTH*sizeof(char));
strcpy(CORE.Window.dropFilesPath[i], paths[i]);
}
diff --git a/src/models.c b/src/models.c
index b9d24e101..551ee7af2 100644
--- a/src/models.c
+++ b/src/models.c
@@ -3205,11 +3205,11 @@ static Model LoadOBJ(const char *fileName)
tinyobj_material_t *materials = NULL;
unsigned int materialCount = 0;
- char *fileData = LoadFileText(fileName);
+ char *fileText = LoadFileText(fileName);
- if (fileData != NULL)
+ if (fileText != NULL)
{
- unsigned int dataSize = (unsigned int)strlen(fileData);
+ unsigned int dataSize = (unsigned int)strlen(fileText);
char currentDir[1024] = { 0 };
strcpy(currentDir, GetWorkingDirectory());
const char *workingDir = GetDirectoryPath(fileName);
@@ -3219,7 +3219,7 @@ static Model LoadOBJ(const char *fileName)
}
unsigned int flags = TINYOBJ_FLAG_TRIANGULATE;
- int ret = tinyobj_parse_obj(&attrib, &meshes, &meshCount, &materials, &materialCount, fileData, dataSize, flags);
+ int ret = tinyobj_parse_obj(&attrib, &meshes, &meshCount, &materials, &materialCount, fileText, dataSize, flags);
if (ret != TINYOBJ_SUCCESS) TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to load OBJ data", fileName);
else TRACELOG(LOG_INFO, "MODEL: [%s] OBJ data loaded successfully: %i meshes / %i materials", fileName, meshCount, materialCount);
@@ -3346,9 +3346,9 @@ static Model LoadOBJ(const char *fileName)
tinyobj_shapes_free(meshes, meshCount);
tinyobj_materials_free(materials, materialCount);
- RL_FREE(fileData);
+ UnloadFileText(fileText);
+
RL_FREE(matFaces);
-
RL_FREE(vCount);
RL_FREE(vtCount);
RL_FREE(vnCount);
@@ -3496,7 +3496,7 @@ static Model LoadIQM(const char *fileName)
//fileDataPtr += sizeof(IQMHeader); // Move file data pointer
// Meshes data processing
- imesh = RL_MALLOC(sizeof(IQMMesh)*iqmHeader->num_meshes);
+ imesh = RL_MALLOC(iqmHeader->num_meshes*sizeof(IQMMesh));
//fseek(iqmFile, iqmHeader->ofs_meshes, SEEK_SET);
//fread(imesh, sizeof(IQMMesh)*iqmHeader->num_meshes, 1, iqmFile);
memcpy(imesh, fileDataPtr + iqmHeader->ofs_meshes, iqmHeader->num_meshes*sizeof(IQMMesh));
@@ -4466,8 +4466,8 @@ static void LoadGLTFBoneAttribute(Model* model, cgltf_accessor* jointsAccessor,
{
if (jointsAccessor->component_type == cgltf_component_type_r_16u)
{
- model->meshes[primitiveIndex].boneIds = RL_MALLOC(sizeof(int)*jointsAccessor->count*4);
- short* bones = RL_MALLOC(sizeof(short)*jointsAccessor->count*4);
+ model->meshes[primitiveIndex].boneIds = RL_MALLOC(jointsAccessor->count*4*sizeof(int));
+ short* bones = RL_MALLOC(jointsAccessor->count*4*sizeof(short));
for (unsigned int a = 0; a < jointsAccessor->count; a++)
{
@@ -4491,8 +4491,8 @@ static void LoadGLTFBoneAttribute(Model* model, cgltf_accessor* jointsAccessor,
}
else if (jointsAccessor->component_type == cgltf_component_type_r_8u)
{
- model->meshes[primitiveIndex].boneIds = RL_MALLOC(sizeof(int)*jointsAccessor->count*4);
- unsigned char* bones = RL_MALLOC(sizeof(unsigned char)*jointsAccessor->count*4);
+ model->meshes[primitiveIndex].boneIds = RL_MALLOC(jointsAccessor->count*4*sizeof(int));
+ unsigned char* bones = RL_MALLOC(jointsAccessor->count*4*sizeof(unsigned char));
for (unsigned int a = 0; a < jointsAccessor->count; a++)
{
diff --git a/src/raylib.h b/src/raylib.h
index 8f3612cf3..b468961b1 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -898,9 +898,9 @@ typedef enum {
// Callbacks to hook some internal functions
// WARNING: This callbacks are intended for advance users
typedef void (*TraceLogCallback)(int logLevel, const char *text, va_list args); // Logging: Redirect trace log messages
-typedef unsigned char* (*LoadFileDataCallback)(const char* fileName, unsigned int* bytesRead); // FileIO: Load binary data
+typedef unsigned char *(*LoadFileDataCallback)(const char *fileName, unsigned int *bytesRead); // FileIO: Load binary data
typedef bool (*SaveFileDataCallback)(const char *fileName, void *data, unsigned int bytesToWrite); // FileIO: Save binary data
-typedef char *(*LoadFileTextCallback)(const char* fileName); // FileIO: Load text data
+typedef char *(*LoadFileTextCallback)(const char *fileName); // FileIO: Load text data
typedef bool (*SaveFileTextCallback)(const char *fileName, char *text); // FileIO: Save text data
@@ -1040,7 +1040,7 @@ RLAPI unsigned char *LoadFileData(const char *fileName, unsigned int *bytesRead)
RLAPI void UnloadFileData(unsigned char *data); // Unload file data allocated by LoadFileData()
RLAPI bool SaveFileData(const char *fileName, void *data, unsigned int bytesToWrite); // Save data to file from byte array (write), returns true on success
RLAPI char *LoadFileText(const char *fileName); // Load text data from file (read), returns a '\0' terminated string
-RLAPI void UnloadFileText(unsigned char *text); // Unload file text data allocated by LoadFileText()
+RLAPI void UnloadFileText(char *text); // Unload file text data allocated by LoadFileText()
RLAPI bool SaveFileText(const char *fileName, char *text); // Save text data to file (write), string must be '\0' terminated, returns true on success
RLAPI bool FileExists(const char *fileName); // Check if file exists
RLAPI bool DirectoryExists(const char *dirPath); // Check if a directory path exists
diff --git a/src/rlgl.h b/src/rlgl.h
index c60a2a701..a40c80477 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -1685,7 +1685,7 @@ void rlLoadExtensions(void *loader)
#if defined(SUPPORT_GL_DETAILS_INFO)
// Get supported extensions list
// WARNING: glGetStringi() not available on OpenGL 2.1
- char **extList = RL_MALLOC(sizeof(char *)*numExt);
+ char **extList = RL_MALLOC(numExt*sizeof(char *));
TRACELOG(LOG_INFO, "GL: OpenGL extensions:");
for (int i = 0; i < numExt; i++)
{
@@ -1966,7 +1966,7 @@ RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements)
#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
// Initialize CPU (RAM) vertex buffers (position, texcoord, color data and indexes)
//--------------------------------------------------------------------------------------------
- batch.vertexBuffer = (VertexBuffer *)RL_MALLOC(sizeof(VertexBuffer)*numBuffers);
+ batch.vertexBuffer = (VertexBuffer *)RL_MALLOC(numBuffers*sizeof(VertexBuffer));
for (int i = 0; i < numBuffers; i++)
{
diff --git a/src/text.c b/src/text.c
index 3e821fe80..23cad7e8d 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1865,7 +1865,7 @@ static Font LoadBMFont(const char *fileName)
}
UnloadImage(imFont);
- RL_FREE(fileText);
+ UnloadFileText(fileText);
if (font.texture.id == 0)
{
diff --git a/src/utils.c b/src/utils.c
index 66804fb2c..c21d23181 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -325,7 +325,7 @@ char *LoadFileText(const char *fileName)
}
// Unload file text data allocated by LoadFileText()
-void UnloadFileText(unsigned char *text)
+void UnloadFileText(char *text)
{
RL_FREE(text);
}