Cleanup add brace (#6545)

* Add braces after if conditions

* More add braces after if conditions

* Add braces after while() conditions

* Fix compilation because of macro being modified

* Add braces to for loop

* Add braces after if/goto

* Move comments up

* Remove extra () in the 'return ...;' statements

* More remove extra () in the 'return ...;' statements

* More remove extra () in the 'return ...;' statements after merge

* Fix inconsistent patterns are xxx == NULL vs !xxx

* More "{}" for "if() break;"  and "if() continue;"

* More "{}" after if() short statement

* More "{}" after "if () return;" statement

* More fix inconsistent patterns are xxx == NULL vs !xxx

* Revert some modificaion on SDL_RLEaccel.c

* SDL_RLEaccel: no short statement

* Cleanup 'if' where the bracket is in a new line

* Cleanup 'while' where the bracket is in a new line

* Cleanup 'for' where the bracket is in a new line

* Cleanup 'else' where the bracket is in a new line

(cherry picked from commit 6a2200823c to reduce conflicts merging between SDL2 and SDL3)
This commit is contained in:
Sylvain Becker 2022-11-27 17:38:43 +01:00 committed by Sam Lantinga
parent 0739d237ad
commit fb0ce375f0
386 changed files with 6103 additions and 4637 deletions

View file

@ -52,7 +52,7 @@ SDL_SetHintWithPriority(const char *name, const char *value,
SDL_Hint *hint;
SDL_HintWatch *entry;
if (!name) {
if (name == NULL) {
return SDL_FALSE;
}
@ -67,7 +67,7 @@ SDL_SetHintWithPriority(const char *name, const char *value,
return SDL_FALSE;
}
if (hint->value != value &&
(!value || !hint->value || SDL_strcmp(hint->value, value) != 0)) {
(value == NULL || !hint->value || SDL_strcmp(hint->value, value) != 0)) {
for (entry = hint->callbacks; entry; ) {
/* Save the next entry in case this one is deleted */
SDL_HintWatch *next = entry->next;
@ -84,7 +84,7 @@ SDL_SetHintWithPriority(const char *name, const char *value,
/* Couldn't find the hint, add a new one */
hint = (SDL_Hint *)SDL_malloc(sizeof(*hint));
if (!hint) {
if (hint == NULL) {
return SDL_FALSE;
}
hint->name = SDL_strdup(name);
@ -103,7 +103,7 @@ SDL_ResetHint(const char *name)
SDL_Hint *hint;
SDL_HintWatch *entry;
if (!name) {
if (name == NULL) {
return SDL_FALSE;
}
@ -181,7 +181,7 @@ SDL_GetHint(const char *name)
SDL_bool
SDL_GetStringBoolean(const char *value, SDL_bool default_value)
{
if (!value || !*value) {
if (value == NULL || !*value) {
return default_value;
}
if (*value == '0' || SDL_strcasecmp(value, "false") == 0) {
@ -204,7 +204,7 @@ SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
SDL_HintWatch *entry;
const char *value;
if (!name || !*name) {
if (name == NULL || !*name) {
SDL_InvalidParamError("name");
return;
}
@ -216,7 +216,7 @@ SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
SDL_DelHintCallback(name, callback, userdata);
entry = (SDL_HintWatch *)SDL_malloc(sizeof(*entry));
if (!entry) {
if (entry == NULL) {
SDL_OutOfMemory();
return;
}
@ -228,10 +228,10 @@ SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
break;
}
}
if (!hint) {
if (hint == NULL) {
/* Need to add a hint entry for this watcher */
hint = (SDL_Hint *)SDL_malloc(sizeof(*hint));
if (!hint) {
if (hint == NULL) {
SDL_OutOfMemory();
SDL_free(entry);
return;