summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRay <[email protected]>2022-01-10 13:54:51 +0100
committerRay <[email protected]>2022-01-10 13:54:51 +0100
commitb4e0ed6007727e1b8259e076b2f09c68e46bce1f (patch)
tree93d98124c1385baea41383125f3e98656e299b0e
parenta6aa5a1e4c34e7d8dfbede6d17ee40f7648265bb (diff)
downloadraylib-b4e0ed6007727e1b8259e076b2f09c68e46bce1f.tar.gz
raylib-b4e0ed6007727e1b8259e076b2f09c68e46bce1f.zip
Review formating
-rw-r--r--src/raylib.h2
-rw-r--r--src/rcore.c30
2 files changed, 16 insertions, 16 deletions
diff --git a/src/raylib.h b/src/raylib.h
index 04795de5..a2e3ea9c 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -1047,7 +1047,7 @@ RLAPI const char *GetFileNameWithoutExt(const char *filePath); // Get filenam
RLAPI const char *GetDirectoryPath(const char *filePath); // Get full path for a given fileName with path (uses static string)
RLAPI const char *GetPrevDirectoryPath(const char *dirPath); // Get previous directory path for a given path (uses static string)
RLAPI const char *GetWorkingDirectory(void); // Get current working directory (uses static string)
-RLAPI const char* GetApplicationDirectory(void); // Get the directory if the running application (uses static string)
+RLAPI const char *GetApplicationDirectory(void); // Get the directory if the running application (uses static string)
RLAPI char **GetDirectoryFiles(const char *dirPath, int *count); // Get filenames in a directory path (memory should be freed)
RLAPI void ClearDirectoryFiles(void); // Clear directory files paths buffers (free memory)
RLAPI bool ChangeDirectory(const char *dir); // Change working directory, return true on success
diff --git a/src/rcore.c b/src/rcore.c
index 422168f0..95bb0bab 100644
--- a/src/rcore.c
+++ b/src/rcore.c
@@ -160,15 +160,14 @@
#define _POSIX_C_SOURCE 199309L // Required for: CLOCK_MONOTONIC if compiled with c99 without gnu ext.
#endif
-
-// platform specific defines to handle GetApplicationDirectory
+// Platform specific defines to handle GetApplicationDirectory()
#if defined (PLATFORM_DESKTOP)
#if defined(_WIN32)
#ifndef MAX_PATH
#define MAX_PATH 1025
#endif
- void* LoadLibraryA(void* lpLibFileName);
- void* LoadLibraryW(void* lpLibFileName);
+ void *LoadLibraryA(void *lpLibFileName);
+ void *LoadLibraryW(void *lpLibFileName);
#ifdef UNICODE
#define LoadLibrary LoadLibraryW
@@ -176,20 +175,20 @@
#define LoadLibrary LoadLibraryA
#endif // !UNICODE
- void* GetProcAddress(void* hModule, void* lpProcName);
+ void *GetProcAddress(void *hModule, void *lpProcName);
- void* GetCurrentProcess(void);
- bool FreeLibrary(void* hLibModule);
+ void *GetCurrentProcess(void);
+ bool FreeLibrary(void *hLibModule);
- int WideCharToMultiByte(unsigned int cp, unsigned long flags, const unsigned short* widestr, int cchwide, char* str, int cbmb, const char* defchar, int* used_default);
+ int WideCharToMultiByte(unsigned int cp, unsigned long flags, const unsigned short *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default);
- const char PathDelim = '\\';
+ const char pathDelim = '\\';
#elif defined(__linux__)
#include <unistd.h>
- const char PathDelim = '/';
+ const char pathDelim = '/';
#elif defined(__APPLE__)
#include <sys/syslimits.h>
- const char PathDelim = '/';
+ const char pathDelim = '/';
#endif // OSs
#endif // PLATFORM_DESKTOP
@@ -3002,7 +3001,7 @@ const char *GetWorkingDirectory(void)
return path;
}
-const char* GetApplicationDirectory(void)
+const char *GetApplicationDirectory(void)
{
static char appDir[MAX_FILEPATH_LENGTH] = { 0 };
memset(appDir, 0, MAX_FILEPATH_LENGTH);
@@ -3011,7 +3010,8 @@ const char* GetApplicationDirectory(void)
typedef unsigned long(*GetModuleFileNameFunc)(void*, void*, void*, unsigned long);
GetModuleFileNameFunc getModuleFileNameExWPtr = NULL;
- void* lib = LoadLibrary(L"psapi.dll");
+ void *lib = LoadLibrary(L"psapi.dll");
+
if (lib == NULL)
{
appDir[0] = '\\';
@@ -3034,7 +3034,6 @@ const char* GetApplicationDirectory(void)
#if defined (UNICODE)
unsigned short widePath[MAX_PATH];
len = getModuleFileNameExWPtr(GetCurrentProcess(), NULL, widePath, MAX_PATH);
-
len = WideCharToMultiByte(0, 0, widePath, len, appDir, MAX_PATH, NULL, NULL);
#else
len = getModuleFileNameExWPtr(GetCurrentProcess(), NULL, appDir, MAX_PATH);
@@ -3051,12 +3050,13 @@ const char* GetApplicationDirectory(void)
}
}
}
+
FreeLibrary(lib);
}
#elif defined(__linux__)
unsigned int size = sizeof(appDir);
-
ssize_t len = readlink("/proc/self/exe", appDir, size);
+
if (len > 0)
{
for (int i = len; i >= 0; --i)