geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filesystem: SDL_EnumerateDirectory should return -1 or 0. 

The callback requesting a non-error stop should not return a special value.
main
Ryan C. Gordon 2024-03-18 15:31:35 -04:00
parent a8ed32c5f7
commit 9192485746
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/SDL3/SDL_filesystem.h
View File

@ -265,7 +265,10 @@ typedef struct SDL_PathInfo
*/ */
extern DECLSPEC int SDLCALL SDL_CreateDirectory(const char *path); extern DECLSPEC int SDLCALL SDL_CreateDirectory(const char *path);
/* Callback for directory enumeration. Return 1 to keep enumerating, 0 to stop enumerating (no error), -1 to stop enumerating and report an error. `dirname` is the directory being enumerated, `fname` is the enumerated entry. */ /* Callback for directory enumeration. Return 1 to keep enumerating,
0 to stop enumerating (no error), -1 to stop enumerating and
report an error. `dirname` is the directory being enumerated,
`fname` is the enumerated entry. */
typedef int (SDLCALL *SDL_EnumerateDirectoryCallback)(void *userdata, const char *dirname, const char *fname); typedef int (SDLCALL *SDL_EnumerateDirectoryCallback)(void *userdata, const char *dirname, const char *fname);
/** /**

2
src/filesystem/SDL_filesystem.c
View File

@ -56,7 +56,7 @@ int SDL_EnumerateDirectory(const char *path, SDL_EnumerateDirectoryCallback call
} else if (!callback) { } else if (!callback) {
return SDL_InvalidParamError("callback"); return SDL_InvalidParamError("callback");
} }
return SDL_SYS_EnumerateDirectory(path, path, callback, userdata); return (SDL_SYS_EnumerateDirectory(path, path, callback, userdata) < 0) ? -1 : 0;
} }
int SDL_GetPathInfo(const char *path, SDL_PathInfo *info) int SDL_GetPathInfo(const char *path, SDL_PathInfo *info)