mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-29 22:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

filesystem: SDL_SYS_EnumerateDirectory() now returns bool.

Browse Source
This commit is contained in:
Ryan C. Gordon
2024-09-26 16:35:15 -04:00
parent 86ea283904
commit 38f971bac5
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/filesystem/SDL_filesystem.c
View File

@@ -69,10 +69,7 @@ bool SDL_EnumerateDirectory(const char *path, SDL_EnumerateDirectoryCallback cal
} else if (!callback) { } else if (!callback) {
return SDL_InvalidParamError("callback"); return SDL_InvalidParamError("callback");
} }
if (SDL_SYS_EnumerateDirectory(path, path, callback, userdata) < 0) { return SDL_SYS_EnumerateDirectory(path, path, callback, userdata);
return false;
}
return true;
} }
bool SDL_GetPathInfo(const char *path, SDL_PathInfo *info) bool SDL_GetPathInfo(const char *path, SDL_PathInfo *info)

2
src/filesystem/SDL_sysfilesystem.h
View File

@@ -27,7 +27,7 @@ extern char *SDL_SYS_GetBasePath(void);
extern char *SDL_SYS_GetPrefPath(const char *org, const char *app); extern char *SDL_SYS_GetPrefPath(const char *org, const char *app);
extern char *SDL_SYS_GetUserFolder(SDL_Folder folder); extern char *SDL_SYS_GetUserFolder(SDL_Folder folder);
extern int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata); extern bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata);
extern bool SDL_SYS_RemovePath(const char *path); extern bool SDL_SYS_RemovePath(const char *path);
extern bool SDL_SYS_RenamePath(const char *oldpath, const char *newpath); extern bool SDL_SYS_RenamePath(const char *oldpath, const char *newpath);
extern bool SDL_SYS_CopyFile(const char *oldpath, const char *newpath); extern bool SDL_SYS_CopyFile(const char *oldpath, const char *newpath);

5
src/filesystem/dummy/SDL_sysfsops.c
View File

@@ -28,10 +28,9 @@
#include "../SDL_sysfilesystem.h" #include "../SDL_sysfilesystem.h"
int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata) bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata)
{ {
SDL_Unsupported(); return SDL_Unsupported();
return -1;
} }
bool SDL_SYS_RemovePath(const char *path) bool SDL_SYS_RemovePath(const char *path)

4
src/filesystem/posix/SDL_sysfsops.c
View File

@@ -34,7 +34,7 @@
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata) bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata)
{ {
int result = 1; int result = 1;
@@ -56,7 +56,7 @@ int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_Enumer
closedir(dir); closedir(dir);
return result; return (result >= 0);
} }
bool SDL_SYS_RemovePath(const char *path) bool SDL_SYS_RemovePath(const char *path)

4
src/filesystem/windows/SDL_sysfsops.c
View File

@@ -29,7 +29,7 @@
#include "../../core/windows/SDL_windows.h" #include "../../core/windows/SDL_windows.h"
#include "../SDL_sysfilesystem.h" #include "../SDL_sysfilesystem.h"
int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata) bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata)
{ {
int result = 1; int result = 1;
if (*path == '\0') { // if empty (completely at the root), we need to enumerate drive letters. if (*path == '\0') { // if empty (completely at the root), we need to enumerate drive letters.
@@ -88,7 +88,7 @@ int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_Enumer
FindClose(dir); FindClose(dir);
} }
return result; return (result >= 0);
} }
bool SDL_SYS_RemovePath(const char *path) bool SDL_SYS_RemovePath(const char *path)