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

Use C99 bool internally in SDL

Browse Source
This commit is contained in:
Sam Lantinga
2024-08-22 09:21:26 -07:00
parent 6501e90018
commit 8f546bb3c9
450 changed files with 6046 additions and 6033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/filesystem/SDL_filesystem.c
View File

@@ -88,18 +88,18 @@ int SDL_GetPathInfo(const char *path, SDL_PathInfo *info)
return SDL_SYS_GetPathInfo(path, info);
}
static SDL_bool EverythingMatch(const char *pattern, const char *str, SDL_bool *matched_to_dir)
static bool EverythingMatch(const char *pattern, const char *str, bool *matched_to_dir)
{
SDL_assert(pattern == NULL);
SDL_assert(str != NULL);
SDL_assert(matched_to_dir != NULL);
*matched_to_dir = SDL_TRUE;
return SDL_TRUE; // everything matches!
*matched_to_dir = true;
return true; // everything matches!
}
// this is just '*' and '?', with '/' matching nothing.
static SDL_bool WildcardMatch(const char *pattern, const char *str, SDL_bool *matched_to_dir)
static bool WildcardMatch(const char *pattern, const char *str, bool *matched_to_dir)
{
SDL_assert(pattern != NULL);
SDL_assert(str != NULL);
@@ -127,8 +127,8 @@ static SDL_bool WildcardMatch(const char *pattern, const char *str, SDL_bool *ma
sch = *(++str);
pch = *(++pattern);
} else if (!pattern_backtrack || (sch_backtrack == '/')) { // we didn't have a match. Are we in a '*' and NOT on a path separator? Keep going. Otherwise, fail.
*matched_to_dir = SDL_FALSE;
return SDL_FALSE;
*matched_to_dir = false;
return false;
} else { // still here? Wasn't a match, but we're definitely in a '*' pattern.
str = ++str_backtrack;
pattern = pattern_backtrack;
@@ -230,7 +230,7 @@ static char *CaseFoldUtf8String(const char *fname)
typedef struct GlobDirCallbackData
{
SDL_bool (*matcher)(const char *pattern, const char *str, SDL_bool *matched_to_dir);
bool (*matcher)(const char *pattern, const char *str, bool *matched_to_dir);
const char *pattern;
int num_entries;
SDL_GlobFlags flags;
@@ -267,8 +267,8 @@ static int SDLCALL GlobDirectoryCallback(void *userdata, const char *dirname, co
}
}
SDL_bool matched_to_dir = SDL_FALSE;
const SDL_bool matched = data->matcher(data->pattern, (folded ? folded : fullpath) + data->basedirlen, &matched_to_dir);
bool matched_to_dir = false;
const bool matched = data->matcher(data->pattern, (folded ? folded : fullpath) + data->basedirlen, &matched_to_dir);
//SDL_Log("GlobDirectoryCallback: Considered %spath='%s' vs pattern='%s': %smatched (matched_to_dir=%s)", folded ? "(folded) " : "", (folded ? folded : fullpath) + data->basedirlen, data->pattern, matched ? "" : "NOT ", matched_to_dir ? "TRUE" : "FALSE");
SDL_free(folded);

4
src/filesystem/cocoa/SDL_sysfilesystem.m
View File

@@ -89,9 +89,9 @@ char *SDL_SYS_GetPrefPath(const char *org, const char *app)
* actually stick around, you'll need to use iCloud storage.
*/
{
static SDL_bool shown = SDL_FALSE;
static bool shown = false;
if (!shown) {
shown = SDL_TRUE;
shown = true;
SDL_LogCritical(SDL_LOG_CATEGORY_SYSTEM, "tvOS does not have persistent local storage! Use iCloud storage if you want your data to persist between sessions.\n");
}
}

2
src/filesystem/gdk/SDL_sysfilesystem.cpp
View File

@@ -44,7 +44,7 @@ SDL_SYS_GetBasePath(void)
DWORD len = 0;
int i;
while (SDL_TRUE) {
while (true) {
void *ptr = SDL_realloc(path, buflen * sizeof(CHAR));
if (!ptr) {
SDL_free(path);

2
src/filesystem/windows/SDL_sysfilesystem.c
View File

@@ -51,7 +51,7 @@ char *SDL_SYS_GetBasePath(void)
DWORD len = 0;
int i;
while (SDL_TRUE) {
while (true) {
void *ptr = SDL_realloc(path, buflen * sizeof(WCHAR));
if (!ptr) {
SDL_free(path);