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

filesystem: SDL_EnumerateDirectoryCallback uses an enum now, not an int.

Browse Source 
Fixes #10955.
This commit is contained in:
Ryan C. Gordon
2024-09-27 22:28:47 -04:00
parent 55bd9f5311
commit 7d21a49c9c
5 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/filesystem/SDL_filesystem.c
View File

@@ -290,7 +290,7 @@ typedef struct GlobDirCallbackData
SDL_IOStream *string_stream;
} GlobDirCallbackData;
static int SDLCALL GlobDirectoryCallback(void *userdata, const char *dirname, const char *fname)
static SDL_EnumerationResult SDLCALL GlobDirectoryCallback(void *userdata, const char *dirname, const char *fname)
{
SDL_assert(userdata != NULL);
SDL_assert(dirname != NULL);
@@ -305,14 +305,14 @@ static int SDLCALL GlobDirectoryCallback(void *userdata, const char *dirname, co
char *fullpath = NULL;
if (SDL_asprintf(&fullpath, "%s/%s", dirname, fname) < 0) {
return -1;
return SDL_ENUM_FAILURE;
}
char *folded = NULL;
if (data->flags & SDL_GLOB_CASEINSENSITIVE) {
folded = CaseFoldUtf8String(fullpath);
if (!folded) {
return -1;
return SDL_ENUM_FAILURE;
}
}
@@ -326,18 +326,18 @@ static int SDLCALL GlobDirectoryCallback(void *userdata, const char *dirname, co
const size_t slen = SDL_strlen(subpath) + 1;
if (SDL_WriteIO(data->string_stream, subpath, slen) != slen) {
SDL_free(fullpath);
return -1; // stop enumerating, return failure to the app.
return SDL_ENUM_FAILURE; // stop enumerating, return failure to the app.
}
data->num_entries++;
}
int result = 1; // keep enumerating by default.
SDL_EnumerationResult result = SDL_ENUM_CONTINUE; // keep enumerating by default.
if (matched_to_dir) {
SDL_PathInfo info;
if (data->getpathinfo(fullpath, &info, data->fsuserdata) && (info.type == SDL_PATHTYPE_DIRECTORY)) {
//SDL_Log("GlobDirectoryCallback: Descending into subdir '%s'", fname);
if (!data->enumerator(fullpath, GlobDirectoryCallback, data, data->fsuserdata)) {
result = -1;
result = SDL_ENUM_FAILURE;
}
}
}

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

@@ -36,7 +36,7 @@
bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata)
{
int result = 1;
SDL_EnumerationResult result = SDL_ENUM_CONTINUE;
DIR *dir = opendir(path);
if (!dir) {
@@ -45,7 +45,7 @@ bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_Enume
}
struct dirent *ent;
while ((result == 1) && ((ent = readdir(dir)) != NULL))
while ((result == SDL_ENUM_CONTINUE) && ((ent = readdir(dir)) != NULL))
{
const char *name = ent->d_name;
if ((SDL_strcmp(name, ".") == 0) || (SDL_strcmp(name, "..") == 0)) {
@@ -56,7 +56,7 @@ bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_Enume
closedir(dir);
return (result >= 0);
return (result != SDL_ENUM_FAILURE);
}
bool SDL_SYS_RemovePath(const char *path)

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

@@ -31,11 +31,11 @@
bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_EnumerateDirectoryCallback cb, void *userdata)
{
int result = 1;
SDL_EnumerationResult result = SDL_ENUM_CONTINUE;
if (*path == '\0') { // if empty (completely at the root), we need to enumerate drive letters.
const DWORD drives = GetLogicalDrives();
char name[3] = { 0, ':', '\0' };
for (int i = 'A'; (result == 1) && (i <= 'Z'); i++) {
for (int i = 'A'; (result == SDL_ENUM_CONTINUE) && (i <= 'Z'); i++) {
if (drives & (1 << (i - 'A'))) {
name[0] = (char) i;
result = cb(userdata, dirname, name);
@@ -78,17 +78,17 @@ bool SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_Enume
char *utf8fn = WIN_StringToUTF8W(fn);
if (!utf8fn) {
result = -1;
result = SDL_ENUM_FAILURE;
} else {
result = cb(userdata, dirname, utf8fn);
SDL_free(utf8fn);
}
} while ((result == 1) && (FindNextFileW(dir, &entw) != 0));
} while ((result == SDL_ENUM_CONTINUE) && (FindNextFileW(dir, &entw) != 0));
FindClose(dir);
}
return (result >= 0);
return (result != SDL_ENUM_FAILURE);
}
bool SDL_SYS_RemovePath(const char *path)