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

src/haptic/android/SDL_syshaptic.c

@@ -54,13 +54,13 @@ SDL_SYS_HapticInit(void)
         timeout = SDL_GetTicks() + 3000;
         Android_JNI_PollHapticDevices();
     }
-    return (numhaptics);
+    return numhaptics;
 }
 
 int
 SDL_SYS_NumHaptics(void)
 {
-    return (numhaptics);
+    return numhaptics;
 }
 
 static SDL_hapticlist_item *
@@ -133,19 +133,19 @@ OpenHaptic(SDL_Haptic *haptic, SDL_hapticlist_item *item)
 static SDL_hapticlist_item *
 OpenHapticByOrder(SDL_Haptic *haptic, int index)
 {
-    return OpenHaptic (haptic, HapticByOrder(index));
+    return OpenHaptic(haptic, HapticByOrder(index));
 }
 
 static SDL_hapticlist_item *
 OpenHapticByDevId(SDL_Haptic *haptic, int device_id)
 {
-    return OpenHaptic (haptic, HapticByDevId(device_id));
+    return OpenHaptic(haptic, HapticByDevId(device_id));
 }
 
 int
 SDL_SYS_HapticOpen(SDL_Haptic *haptic)
 {
-    return (OpenHapticByOrder(haptic, haptic->index) == NULL ? -1 : 0);
+    return OpenHapticByOrder(haptic, haptic->index) == NULL ? -1 : 0;
 }
 
 
@@ -168,14 +168,14 @@ SDL_SYS_JoystickIsHaptic(SDL_Joystick *joystick)
 int
 SDL_SYS_HapticOpenFromJoystick(SDL_Haptic *haptic, SDL_Joystick *joystick)
 {
-    return (OpenHapticByDevId(haptic, ((joystick_hwdata *)joystick->hwdata)->device_id) == NULL ? -1 : 0);
+    return OpenHapticByDevId(haptic, ((joystick_hwdata *)joystick->hwdata)->device_id) == NULL ? -1 : 0;
 }
 
 
 int
 SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
 {
-    return (((SDL_hapticlist_item *)haptic->hwdata)->device_id == ((joystick_hwdata *)joystick->hwdata)->device_id ? 1 : 0);
+    return ((SDL_hapticlist_item *)haptic->hwdata)->device_id == ((joystick_hwdata *)joystick->hwdata)->device_id ? 1 : 0;
 }