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)

test/testautomation_video.c

@@ -836,7 +836,9 @@ video_getSetWindowGrab(void *arg)
 
   /* Call against new test window */
   window = _createVideoSuiteTestWindow(title);
-  if (window == NULL) return TEST_ABORTED;
+  if (window == NULL) {
+    return TEST_ABORTED;
+  }
 
   /* Get state */
   originalMouseState = SDL_GetWindowMouseGrab(window);
@@ -980,7 +982,9 @@ video_getWindowId(void *arg)
 
   /* Call against new test window */
   window = _createVideoSuiteTestWindow(title);
-  if (window == NULL) return TEST_ABORTED;
+  if (window == NULL) {
+    return TEST_ABORTED;
+  }
 
   /* Get ID */
   id = SDL_GetWindowID(window);
@@ -1034,7 +1038,9 @@ video_getWindowPixelFormat(void *arg)
 
   /* Call against new test window */
   window = _createVideoSuiteTestWindow(title);
-  if (window == NULL) return TEST_ABORTED;
+  if (window == NULL) {
+    return TEST_ABORTED;
+  }
 
   /* Get format */
   format = SDL_GetWindowPixelFormat(window);
@@ -1072,7 +1078,9 @@ video_getSetWindowPosition(void *arg)
 
   /* Call against new test window */
   window = _createVideoSuiteTestWindow(title);
-  if (window == NULL) return TEST_ABORTED;
+  if (window == NULL) {
+   return TEST_ABORTED;
+  }
 
   for (xVariation = 0; xVariation < 4; xVariation++) {
    for (yVariation = 0; yVariation < 4; yVariation++) {
@@ -1222,11 +1230,15 @@ video_getSetWindowSize(void *arg)
   result = SDL_GetDisplayBounds(0, &display);
   SDLTest_AssertPass("SDL_GetDisplayBounds()");
   SDLTest_AssertCheck(result == 0, "Verify return value; expected: 0, got: %d", result);
-  if (result != 0) return TEST_ABORTED;
+  if (result != 0) {
+   return TEST_ABORTED;
+  }
 
   /* Call against new test window */
   window = _createVideoSuiteTestWindow(title);
-  if (window == NULL) return TEST_ABORTED;
+  if (window == NULL) {
+   return TEST_ABORTED;
+  }
 
 #ifdef __WIN32__
   /* Platform clips window size to screen size */
@@ -1386,11 +1398,15 @@ video_getSetWindowMinimumSize(void *arg)
   result = SDL_GetDisplayBounds(0, &display);
   SDLTest_AssertPass("SDL_GetDisplayBounds()");
   SDLTest_AssertCheck(result == 0, "Verify return value; expected: 0, got: %d", result);
-  if (result != 0) return TEST_ABORTED;
+  if (result != 0) {
+   return TEST_ABORTED;
+  }
 
   /* Call against new test window */
   window = _createVideoSuiteTestWindow(title);
-  if (window == NULL) return TEST_ABORTED;
+  if (window == NULL) {
+   return TEST_ABORTED;
+  }
 
   for (wVariation = 0; wVariation < 5; wVariation++) {
    for (hVariation = 0; hVariation < 5; hVariation++) {
@@ -1525,11 +1541,15 @@ video_getSetWindowMaximumSize(void *arg)
   result = SDL_GetDisplayBounds(0, &display);
   SDLTest_AssertPass("SDL_GetDisplayBounds()");
   SDLTest_AssertCheck(result == 0, "Verify return value; expected: 0, got: %d", result);
-  if (result != 0) return TEST_ABORTED;
+  if (result != 0) {
+   return TEST_ABORTED;
+  }
 
   /* Call against new test window */
   window = _createVideoSuiteTestWindow(title);
-  if (window == NULL) return TEST_ABORTED;
+  if (window == NULL) {
+   return TEST_ABORTED;
+  }
 
   for (wVariation = 0; wVariation < 3; wVariation++) {
    for (hVariation = 0; hVariation < 3; hVariation++) {
@@ -1667,7 +1687,9 @@ video_getSetWindowData(void *arg)
 
   /* Call against new test window */
   window = _createVideoSuiteTestWindow(title);
-  if (window == NULL) return TEST_ABORTED;
+  if (window == NULL) {
+    return TEST_ABORTED;
+  }
 
   /* Create testdata */
   datasize = SDLTest_RandomIntegerInRange(1, 32);
@@ -1879,14 +1901,16 @@ video_setWindowCenteredOnDisplay(void *arg)
     result = SDL_GetDisplayBounds(0 % displayNum, &display0);
     SDLTest_AssertPass("SDL_GetDisplayBounds()");
     SDLTest_AssertCheck(result == 0, "Verify return value; expected: 0, got: %d", result);
-    if (result != 0)
+    if (result != 0) {
         return TEST_ABORTED;
+    }
 
     result = SDL_GetDisplayBounds(1 % displayNum, &display1);
     SDLTest_AssertPass("SDL_GetDisplayBounds()");
     SDLTest_AssertCheck(result == 0, "Verify return value; expected: 0, got: %d", result);
-    if (result != 0)
+    if (result != 0) {
         return TEST_ABORTED;
+    }
 
     for (xVariation = 0; xVariation < 2; xVariation++) {
         for (yVariation = 0; yVariation < 2; yVariation++) {