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:
1 parent
0739d237ad
commit
fb0ce375f0
386 files changed
+6103
-4637
No files matched your search
@@ -461,8 +461,7 @@ int audio_printAudioDrivers()
|
||||
SDLTest_AssertCheck(n>=0, "Verify number of audio drivers >= 0, got: %i", n);
|
||||
|
||||
/* List drivers. */
|
||||
if (n>0)
|
||||
{
|
||||
if (n>0) {
|
||||
for (i=0; i<n; i++) {
|
||||
name = SDL_GetAudioDriver(i);
|
||||
SDLTest_AssertPass("Call to SDL_GetAudioDriver(%i)", i);
|
||||
@@ -712,7 +711,9 @@ int audio_openCloseAndGetAudioStatus()
|
||||
device = SDL_GetAudioDeviceName(i, 0);
|
||||
SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i);
|
||||
SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL");
|
||||
if (device == NULL) return TEST_ABORTED;
|
||||
if (device == NULL) {
|
||||
return TEST_ABORTED;
|
||||
}
|
||||
|
||||
/* Set standard desired spec */
|
||||
desired.freq=22050;
|
||||
@@ -770,7 +771,9 @@ int audio_lockUnlockOpenAudioDevice()
|
||||
device = SDL_GetAudioDeviceName(i, 0);
|
||||
SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i);
|
||||
SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL");
|
||||
if (device == NULL) return TEST_ABORTED;
|
||||
if (device == NULL) {
|
||||
return TEST_ABORTED;
|
||||
}
|
||||
|
||||
/* Set standard desired spec */
|
||||
desired.freq=22050;
|
||||
@@ -878,7 +881,9 @@ int audio_convertAudio()
|
||||
SDLTest_LogError("%s", SDL_GetError());
|
||||
} else {
|
||||
SDLTest_AssertCheck(cvt.len_mult > 0, "Verify that cvt.len_mult value; expected: >0, got: %i", cvt.len_mult);
|
||||
if (cvt.len_mult < 1) return TEST_ABORTED;
|
||||
if (cvt.len_mult < 1) {
|
||||
return TEST_ABORTED;
|
||||
}
|
||||
|
||||
/* Create some random data to convert */
|
||||
l = 64;
|
||||
@@ -887,7 +892,9 @@ int audio_convertAudio()
|
||||
cvt.len = l;
|
||||
cvt.buf = (Uint8 *)SDL_malloc(ll);
|
||||
SDLTest_AssertCheck(cvt.buf != NULL, "Check data buffer to convert is not NULL");
|
||||
if (cvt.buf == NULL) return TEST_ABORTED;
|
||||
if (cvt.buf == NULL) {
|
||||
return TEST_ABORTED;
|
||||
}
|
||||
|
||||
/* Convert the data */
|
||||
result = SDL_ConvertAudio(&cvt);
|
||||
@@ -932,7 +939,9 @@ int audio_openCloseAudioDeviceConnected()
|
||||
device = SDL_GetAudioDeviceName(i, 0);
|
||||
SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i);
|
||||
SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL");
|
||||
if (device == NULL) return TEST_ABORTED;
|
||||
if (device == NULL) {
|
||||
return TEST_ABORTED;
|
||||
}
|
||||
|
||||
/* Set standard desired spec */
|
||||
desired.freq=22050;
|
||||
|
||||
Reference in new issue
Block a user