UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some naming tweaks

Browse source
This commit is contained in:
Ray 2021-03-04 20:22:58 +01:00
parent 1ed72b7812
commit 7ad1370193
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/rlgl.h
View file

@ -4915,21 +4915,21 @@ char *LoadFileText(const char *fileName)
if (fileName != NULL) if (fileName != NULL)
{ {
FILE *textFile = fopen(fileName, "rt"); FILE *file = fopen(fileName, "rt");
if (textFile != NULL) if (file != NULL)
{ {
// WARNING: When reading a file as 'text' file, // WARNING: When reading a file as 'text' file,
// text mode causes carriage return-linefeed translation... // text mode causes carriage return-linefeed translation...
// ...but using fseek() should return correct byte-offset // ...but using fseek() should return correct byte-offset
fseek(textFile, 0, SEEK_END); fseek(file, 0, SEEK_END);
int size = ftell(textFile); int size = ftell(file);
fseek(textFile, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
if (size > 0) if (size > 0)
{ {
text = (char *)RL_MALLOC((size + 1)*sizeof(char)); text = (char *)RL_MALLOC((size + 1)*sizeof(char));
int count = (int)fread(text, sizeof(char), size, textFile); int count = (int)fread(text, sizeof(char), size, file);
// WARNING: \r\n is converted to \n on reading, so, // WARNING: \r\n is converted to \n on reading, so,
// read bytes count gets reduced by the number of lines // read bytes count gets reduced by the number of lines
@ -4942,7 +4942,7 @@ char *LoadFileText(const char *fileName)
} }
else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to read text file", fileName); else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to read text file", fileName);
fclose(textFile); fclose(file);
} }
else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to open text file", fileName); else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to open text file", fileName);
} }

16
src/utils.c
View file

@ -45,7 +45,7 @@
#include <android/asset_manager.h> // Required for: Android assets manager: AAsset, AAssetManager_open(), ... #include <android/asset_manager.h> // Required for: Android assets manager: AAsset, AAssetManager_open(), ...
#endif #endif
#include <stdlib.h> // Required for: exit() #include <stdlib.h> // Required for: exit(), FILE, fopen(), fseek(), ftell(), fread(), fwrite(), fprintf(), fclose()
#include <stdio.h> // Required for: vprintf() #include <stdio.h> // Required for: vprintf()
#include <stdarg.h> // Required for: va_list, va_start(), va_end() #include <stdarg.h> // Required for: va_list, va_start(), va_end()
#include <string.h> // Required for: strcpy(), strcat() #include <string.h> // Required for: strcpy(), strcat()
@ -289,21 +289,21 @@ char *LoadFileText(const char *fileName)
if (fileName != NULL) if (fileName != NULL)
{ {
FILE *textFile = fopen(fileName, "rt"); FILE *file = fopen(fileName, "rt");
if (textFile != NULL) if (file != NULL)
{ {
// WARNING: When reading a file as 'text' file, // WARNING: When reading a file as 'text' file,
// text mode causes carriage return-linefeed translation... // text mode causes carriage return-linefeed translation...
// ...but using fseek() should return correct byte-offset // ...but using fseek() should return correct byte-offset
fseek(textFile, 0, SEEK_END); fseek(file, 0, SEEK_END);
unsigned int size = (unsigned int)ftell(textFile); unsigned int size = (unsigned int)ftell(file);
fseek(textFile, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
if (size > 0) if (size > 0)
{ {
text = (char *)RL_MALLOC((size + 1)*sizeof(char)); text = (char *)RL_MALLOC((size + 1)*sizeof(char));
unsigned int count = (unsigned int)fread(text, sizeof(char), size, textFile); unsigned int count = (unsigned int)fread(text, sizeof(char), size, file);
// WARNING: \r\n is converted to \n on reading, so, // WARNING: \r\n is converted to \n on reading, so,
// read bytes count gets reduced by the number of lines // read bytes count gets reduced by the number of lines
@ -316,7 +316,7 @@ char *LoadFileText(const char *fileName)
} }
else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to read text file", fileName); else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to read text file", fileName);
fclose(textFile); fclose(file);
} }
else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to open text file", fileName); else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to open text file", fileName);
} }