From fb0ce375f0474501764a4bce7b609a1eab143526 Mon Sep 17 00:00:00 2001
From: Sylvain Becker <[EMAIL REDACTED]>
Date: Sun, 27 Nov 2022 17:38:43 +0100
Subject: [PATCH] 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 6a2200823c66e53bd3cda4a25f0206b834392652 to reduce conflicts merging between SDL2 and SDL3)
---
VisualC-GDK/tests/testgdk/src/testgdk.cpp | 13 +-
Xcode-iOS/Demos/src/accelerometer.c | 4 +-
Xcode-iOS/Demos/src/fireworks.c | 25 +-
Xcode-iOS/Demos/src/happy.c | 2 +-
Xcode-iOS/Demos/src/keyboard.c | 4 +-
Xcode-iOS/Demos/src/mixer.c | 4 +-
Xcode-iOS/Demos/src/rectangles.c | 4 +-
Xcode-iOS/Demos/src/touch.c | 2 +-
src/SDL.c | 21 +-
src/SDL_assert.c | 5 +-
src/SDL_dataqueue.c | 22 +-
src/SDL_guid.c | 6 +-
src/SDL_hints.c | 18 +-
src/SDL_log.c | 10 +-
src/atomic/SDL_atomic.c | 20 +-
src/atomic/SDL_spinlock.c | 22 +-
src/audio/SDL_audio.c | 8 +-
src/audio/SDL_audiocvt.c | 42 +-
src/audio/SDL_audiodev.c | 3 +-
src/audio/SDL_wave.c | 14 +-
src/audio/aaudio/SDL_aaudio.c | 2 +-
src/audio/alsa/SDL_alsa_audio.c | 69 +-
src/audio/android/SDL_androidaudio.c | 14 +-
src/audio/directsound/SDL_directsound.c | 6 +-
src/audio/disk/SDL_diskaudio.c | 2 +-
src/audio/dsp/SDL_dspaudio.c | 11 +-
src/audio/jack/SDL_jackaudio.c | 2 +-
src/audio/netbsd/SDL_netbsdaudio.c | 2 +-
src/audio/openslES/SDL_openslES.c | 4 +-
src/audio/pipewire/SDL_pipewire.c | 10 +-
src/audio/ps2/SDL_ps2audio.c | 3 +-
src/audio/psp/SDL_pspaudio.c | 4 +-
src/audio/pulseaudio/SDL_pulseaudio.c | 14 +-
src/audio/vita/SDL_vitaaudio.c | 4 +-
src/audio/wasapi/SDL_wasapi_winrt.cpp | 5 +-
src/core/android/SDL_android.c | 27 +-
src/core/freebsd/SDL_evdev_kbd_freebsd.c | 111 +-
src/core/gdk/SDL_gdk.cpp | 4 +-
src/core/linux/SDL_dbus.c | 25 +-
src/core/linux/SDL_evdev.c | 84 +-
src/core/linux/SDL_evdev_capabilities.c | 3 +-
src/core/linux/SDL_evdev_kbd.c | 64 +-
src/core/linux/SDL_fcitx.c | 34 +-
src/core/linux/SDL_ibus.c | 73 +-
src/core/linux/SDL_ime.c | 27 +-
src/core/linux/SDL_threadprio.c | 46 +-
src/core/linux/SDL_udev.c | 11 +-
src/core/openbsd/SDL_wscons_kbd.c | 155 +-
src/core/openbsd/SDL_wscons_mouse.c | 14 +-
src/core/windows/SDL_hid.c | 6 +-
src/core/windows/SDL_immdevice.c | 4 +-
src/core/windows/SDL_windows.c | 6 +-
src/core/windows/SDL_xinput.c | 4 +-
src/core/winrt/SDL_winrtapp_common.cpp | 11 +-
src/core/winrt/SDL_winrtapp_direct3d.cpp | 8 +-
src/cpuinfo/SDL_cpuinfo.c | 39 +-
src/events/SDL_clipboardevents.c | 2 +-
src/events/SDL_displayevents.c | 4 +-
src/events/SDL_events.c | 32 +-
src/events/SDL_gesture.c | 90 +-
src/events/SDL_keyboard.c | 17 +-
src/events/SDL_mouse.c | 28 +-
src/events/SDL_touch.c | 50 +-
src/events/SDL_windowevents.c | 2 +-
src/file/SDL_rwops.c | 59 +-
src/filesystem/android/SDL_sysfilesystem.c | 2 +-
src/filesystem/emscripten/SDL_sysfilesystem.c | 9 +-
src/filesystem/haiku/SDL_sysfilesystem.cc | 8 +-
src/filesystem/ps2/SDL_sysfilesystem.c | 13 +-
src/filesystem/psp/SDL_sysfilesystem.c | 4 +-
src/filesystem/riscos/SDL_sysfilesystem.c | 25 +-
src/filesystem/unix/SDL_sysfilesystem.c | 38 +-
src/filesystem/vita/SDL_sysfilesystem.c | 6 +-
src/filesystem/windows/SDL_sysfilesystem.c | 6 +-
src/filesystem/winrt/SDL_sysfilesystem.cpp | 12 +-
src/haptic/SDL_haptic.c | 44 +-
src/haptic/android/SDL_syshaptic.c | 14 +-
src/haptic/darwin/SDL_syshaptic.c | 3 +-
src/haptic/linux/SDL_syshaptic.c | 34 +-
src/haptic/windows/SDL_dinputhaptic.c | 15 +-
src/haptic/windows/SDL_xinputhaptic.c | 2 +-
src/hidapi/SDL_hidapi.c | 34 +-
src/joystick/SDL_gamecontroller.c | 154 +-
src/joystick/SDL_joystick.c | 41 +-
src/joystick/android/SDL_sysjoystick.c | 2 +-
src/joystick/bsd/SDL_bsdjoystick.c | 27 +-
src/joystick/darwin/SDL_iokitjoystick.c | 26 +-
src/joystick/emscripten/SDL_sysjoystick.c | 24 +-
src/joystick/haiku/SDL_haikujoystick.cc | 3 +-
src/joystick/hidapi/SDL_hidapi_gamecube.c | 4 +-
src/joystick/hidapi/SDL_hidapi_luna.c | 19 +-
src/joystick/hidapi/SDL_hidapi_ps3.c | 14 +-
src/joystick/hidapi/SDL_hidapi_ps4.c | 12 +-
src/joystick/hidapi/SDL_hidapi_ps5.c | 10 +-
src/joystick/hidapi/SDL_hidapi_rumble.c | 2 +-
src/joystick/hidapi/SDL_hidapi_shield.c | 12 +-
src/joystick/hidapi/SDL_hidapi_stadia.c | 10 +-
src/joystick/hidapi/SDL_hidapi_steam.c | 231 +--
src/joystick/hidapi/SDL_hidapi_switch.c | 41 +-
src/joystick/hidapi/SDL_hidapi_wii.c | 10 +-
src/joystick/hidapi/SDL_hidapi_xbox360.c | 10 +-
src/joystick/hidapi/SDL_hidapi_xbox360w.c | 11 +-
src/joystick/hidapi/SDL_hidapi_xboxone.c | 24 +-
src/joystick/hidapi/SDL_hidapijoystick.c | 20 +-
src/joystick/linux/SDL_sysjoystick.c | 56 +-
src/joystick/n3ds/SDL_sysjoystick.c | 2 +-
src/joystick/ps2/SDL_sysjoystick.c | 20 +-
src/joystick/psp/SDL_sysjoystick.c | 14 +-
src/joystick/virtual/SDL_virtualjoystick.c | 27 +-
src/joystick/vita/SDL_sysjoystick.c | 21 +-
src/joystick/windows/SDL_dinputjoystick.c | 36 +-
src/joystick/windows/SDL_rawinputjoystick.c | 43 +-
.../windows/SDL_windows_gaming_input.c | 6 +-
src/joystick/windows/SDL_windowsjoystick.c | 32 +-
src/joystick/windows/SDL_xinputjoystick.c | 15 +-
src/loadso/dlopen/SDL_sysloadso.c | 4 +-
src/loadso/dummy/SDL_sysloadso.c | 4 +-
src/loadso/windows/SDL_sysloadso.c | 2 +-
src/locale/SDL_locale.c | 9 +-
src/locale/unix/SDL_syslocale.c | 2 +-
src/locale/vita/SDL_syslocale.c | 3 +-
src/locale/windows/SDL_syslocale.c | 2 +-
src/locale/winrt/SDL_syslocale.c | 3 +-
src/main/dummy/SDL_dummy_main.c | 2 +-
src/main/haiku/SDL_BeApp.cc | 9 +-
src/main/ngage/SDL_ngage_main.cpp | 7 +-
src/main/ps2/SDL_ps2_main.c | 6 +-
src/main/psp/SDL_psp_main.c | 3 +-
src/main/windows/SDL_windows_main.c | 4 +-
src/misc/SDL_url.c | 2 +-
src/power/emscripten/SDL_syspower.c | 3 +-
src/power/linux/SDL_syspower.c | 16 +-
src/power/windows/SDL_syspower.c | 3 +-
src/render/SDL_render.c | 94 +-
src/render/SDL_yuv_sw.c | 11 +-
src/render/direct3d/SDL_render_d3d.c | 37 +-
src/render/direct3d11/SDL_render_d3d11.c | 35 +-
src/render/direct3d11/SDL_render_winrt.cpp | 2 +-
src/render/direct3d12/SDL_render_d3d12.c | 58 +-
src/render/opengl/SDL_render_gl.c | 29 +-
src/render/opengl/SDL_shaders_gl.c | 4 +-
src/render/opengles/SDL_render_gles.c | 18 +-
src/render/opengles2/SDL_render_gles2.c | 29 +-
src/render/opengles2/SDL_shaders_gles2.c | 9 +-
src/render/ps2/SDL_render_ps2.c | 47 +-
src/render/psp/SDL_render_psp.c | 150 +-
src/render/software/SDL_blendfillrect.c | 6 +-
src/render/software/SDL_blendline.c | 8 +-
src/render/software/SDL_blendpoint.c | 6 +-
src/render/software/SDL_drawline.c | 8 +-
src/render/software/SDL_drawpoint.c | 4 +-
src/render/software/SDL_render_sw.c | 34 +-
src/render/software/SDL_rotate.c | 49 +-
src/render/software/SDL_triangle.c | 24 +-
src/render/vitagxm/SDL_render_vita_gxm.c | 36 +-
.../vitagxm/SDL_render_vita_gxm_memory.c | 45 +-
.../vitagxm/SDL_render_vita_gxm_tools.c | 21 +-
src/sensor/SDL_sensor.c | 2 +-
src/sensor/android/SDL_androidsensor.c | 8 +-
src/sensor/vita/SDL_vitasensor.c | 11 +-
src/sensor/windows/SDL_windowssensor.c | 6 +-
src/stdlib/SDL_crc16.c | 2 +-
src/stdlib/SDL_crc32.c | 2 +-
src/stdlib/SDL_getenv.c | 36 +-
src/stdlib/SDL_iconv.c | 24 +-
src/stdlib/SDL_string.c | 105 +-
src/test/SDL_test_assert.c | 14 +-
src/test/SDL_test_common.c | 60 +-
src/test/SDL_test_font.c | 13 +-
src/test/SDL_test_fuzzer.c | 10 +-
src/test/SDL_test_harness.c | 48 +-
src/test/SDL_test_md5.c | 35 +-
src/test/SDL_test_memory.c | 6 +-
src/test/SDL_test_random.c | 17 +-
src/thread/SDL_thread.c | 22 +-
src/thread/generic/SDL_syscond.c | 6 +-
src/thread/generic/SDL_syssem.c | 8 +-
src/thread/generic/SDL_systhread.c | 4 +-
src/thread/n3ds/SDL_syscond.c | 16 +-
src/thread/n3ds/SDL_syssem.c | 18 +-
src/thread/ngage/SDL_sysmutex.cpp | 24 +-
src/thread/ngage/SDL_syssem.cpp | 51 +-
src/thread/ngage/SDL_systhread.cpp | 21 +-
src/thread/ps2/SDL_syssem.c | 3 +-
src/thread/psp/SDL_syscond.c | 8 +-
src/thread/pthread/SDL_syscond.c | 10 +-
src/thread/pthread/SDL_sysmutex.c | 2 +-
src/thread/pthread/SDL_syssem.c | 8 +-
src/thread/pthread/SDL_systhread.c | 2 +-
src/thread/stdcpp/SDL_syscond.cpp | 6 +-
src/thread/stdcpp/SDL_systhread.cpp | 9 +-
src/thread/vita/SDL_syscond.c | 8 +-
src/thread/windows/SDL_syscond_cv.c | 12 +-
src/thread/windows/SDL_sysmutex.c | 2 +-
src/thread/windows/SDL_syssem.c | 18 +-
src/thread/windows/SDL_systhread.c | 4 +-
src/timer/SDL_timer.c | 8 +-
src/timer/ngage/SDL_systimer.cpp | 6 +-
src/timer/psp/SDL_systimer.c | 3 +-
src/timer/unix/SDL_systimer.c | 4 +-
src/timer/vita/SDL_systimer.c | 3 +-
src/video/SDL_RLEaccel.c | 179 +-
src/video/SDL_blit.c | 2 +-
src/video/SDL_blit_A.c | 40 +-
src/video/SDL_blit_N.c | 37 +-
src/video/SDL_blit_auto.c | 1664 ++++++++++++-----
src/video/SDL_blit_copy.c | 8 +-
src/video/SDL_blit_slow.c | 21 +-
src/video/SDL_bmp.c | 66 +-
src/video/SDL_clipboard.c | 20 +-
src/video/SDL_egl.c | 12 +-
src/video/SDL_fillrect.c | 8 +-
src/video/SDL_pixels.c | 73 +-
src/video/SDL_rect.c | 4 +-
src/video/SDL_rect_impl.h | 28 +-
src/video/SDL_shape.c | 59 +-
src/video/SDL_surface.c | 91 +-
src/video/SDL_video.c | 176 +-
src/video/SDL_vulkan_utils.c | 18 +-
src/video/SDL_yuv.c | 46 +-
src/video/android/SDL_androidkeyboard.c | 2 +-
src/video/android/SDL_androidmouse.c | 8 +-
src/video/android/SDL_androidtouch.c | 2 +-
src/video/android/SDL_androidvideo.c | 7 +-
src/video/android/SDL_androidvulkan.c | 50 +-
src/video/android/SDL_androidwindow.c | 4 +-
src/video/dummy/SDL_nullframebuffer.c | 4 +-
src/video/dummy/SDL_nullvideo.c | 6 +-
src/video/emscripten/SDL_emscriptenevents.c | 27 +-
.../emscripten/SDL_emscriptenframebuffer.c | 4 +-
src/video/emscripten/SDL_emscriptenmouse.c | 20 +-
src/video/emscripten/SDL_emscriptenvideo.c | 19 +-
src/video/haiku/SDL_bclipboard.cc | 12 +-
src/video/haiku/SDL_bframebuffer.cc | 13 +-
src/video/haiku/SDL_bkeyboard.cc | 10 +-
src/video/haiku/SDL_bmessagebox.cc | 68 +-
src/video/haiku/SDL_bmodes.cc | 46 +-
src/video/haiku/SDL_bopengl.cc | 10 +-
src/video/haiku/SDL_bvideo.cc | 16 +-
src/video/haiku/SDL_bwindow.cc | 22 +-
src/video/kmsdrm/SDL_kmsdrmdyn.c | 8 +-
src/video/kmsdrm/SDL_kmsdrmmouse.c | 12 +-
src/video/kmsdrm/SDL_kmsdrmopengles.c | 2 +-
src/video/kmsdrm/SDL_kmsdrmvideo.c | 100 +-
src/video/kmsdrm/SDL_kmsdrmvulkan.c | 79 +-
src/video/n3ds/SDL_n3dsframebuffer.c | 8 +-
src/video/n3ds/SDL_n3dsvideo.c | 4 +-
src/video/ngage/SDL_ngageevents.cpp | 3 +-
src/video/ngage/SDL_ngageframebuffer.cpp | 70 +-
src/video/ngage/SDL_ngagevideo.cpp | 30 +-
src/video/ngage/SDL_ngagewindow.cpp | 2 +-
.../offscreen/SDL_offscreenframebuffer.c | 4 +-
src/video/offscreen/SDL_offscreenvideo.c | 4 +-
src/video/offscreen/SDL_offscreenwindow.c | 2 +-
src/video/ps2/SDL_ps2video.c | 4 +-
src/video/psp/SDL_pspevents.c | 19 +-
src/video/psp/SDL_pspgl.c | 9 +-
src/video/raspberry/SDL_rpivideo.c | 2 +-
src/video/riscos/SDL_riscosevents.c | 3 +-
src/video/riscos/SDL_riscosmessagebox.c | 9 +-
src/video/riscos/SDL_riscosmodes.c | 9 +-
src/video/riscos/SDL_riscosvideo.c | 4 +-
src/video/riscos/SDL_riscoswindow.c | 5 +-
src/video/vita/SDL_vitaframebuffer.c | 11 +-
src/video/vita/SDL_vitagl_pvr.c | 9 +-
src/video/vita/SDL_vitagles.c | 3 +-
src/video/vita/SDL_vitagles_pvr.c | 6 +-
src/video/vita/SDL_vitakeyboard.c | 42 +-
src/video/vita/SDL_vitamessagebox.c | 53 +-
src/video/vita/SDL_vitamouse.c | 15 +-
src/video/vita/SDL_vitatouch.c | 14 +-
src/video/vita/SDL_vitavideo.c | 24 +-
src/video/vivante/SDL_vivantevulkan.c | 47 +-
src/video/wayland/SDL_waylanddyn.c | 8 +-
src/video/wayland/SDL_waylandevents.c | 106 +-
src/video/wayland/SDL_waylandkeyboard.c | 10 +-
src/video/wayland/SDL_waylandmessagebox.c | 4 +-
src/video/wayland/SDL_waylandmouse.c | 31 +-
src/video/wayland/SDL_waylandopengles.c | 3 +-
src/video/wayland/SDL_waylandtouch.h | 2 +-
src/video/wayland/SDL_waylandvideo.c | 6 +-
src/video/wayland/SDL_waylandvulkan.c | 50 +-
src/video/wayland/SDL_waylandwindow.c | 3 +-
src/video/windows/SDL_windowsclipboard.c | 2 +-
src/video/windows/SDL_windowsevents.c | 76 +-
src/video/windows/SDL_windowsframebuffer.c | 5 +-
src/video/windows/SDL_windowskeyboard.c | 246 ++-
src/video/windows/SDL_windowsmessagebox.c | 22 +-
src/video/windows/SDL_windowsmodes.c | 14 +-
src/video/windows/SDL_windowsmouse.c | 2 +-
src/video/windows/SDL_windowsopengl.c | 31 +-
src/video/windows/SDL_windowsshape.c | 25 +-
src/video/windows/SDL_windowsvideo.c | 16 +-
src/video/windows/SDL_windowsvulkan.c | 50 +-
src/video/windows/SDL_windowswindow.c | 18 +-
src/video/winrt/SDL_winrtgamebar.cpp | 6 +-
src/video/winrt/SDL_winrtvideo.cpp | 12 +-
src/video/x11/SDL_x11clipboard.c | 2 +-
src/video/x11/SDL_x11dyn.c | 8 +-
src/video/x11/SDL_x11events.c | 116 +-
src/video/x11/SDL_x11framebuffer.c | 36 +-
src/video/x11/SDL_x11keyboard.c | 2 +-
src/video/x11/SDL_x11messagebox.c | 21 +-
src/video/x11/SDL_x11modes.c | 30 +-
src/video/x11/SDL_x11mouse.c | 15 +-
src/video/x11/SDL_x11opengl.c | 41 +-
src/video/x11/SDL_x11shape.c | 20 +-
src/video/x11/SDL_x11video.c | 10 +-
src/video/x11/SDL_x11vulkan.c | 94 +-
src/video/x11/SDL_x11window.c | 45 +-
src/video/x11/SDL_x11xfixes.c | 4 +-
src/video/x11/SDL_x11xinput2.c | 16 +-
test/checkkeys.c | 47 +-
test/checkkeysthreads.c | 45 +-
test/controllermap.c | 8 +-
test/loopwave.c | 7 +-
test/loopwavequeue.c | 8 +-
test/testatomic.c | 9 +-
test/testaudiocapture.c | 2 +-
test/testaudiohotplug.c | 9 +-
test/testaudioinfo.c | 2 +-
test/testautomation.c | 19 +-
test/testautomation_audio.c | 23 +-
test/testautomation_mouse.c | 12 +-
test/testautomation_pixels.c | 2 +-
test/testautomation_platform.c | 21 +-
test/testautomation_rect.c | 80 +-
test/testautomation_render.c | 191 +-
test/testautomation_rwops.c | 38 +-
test/testautomation_stdlib.c | 2 +-
test/testautomation_surface.c | 43 +-
test/testautomation_video.c | 50 +-
test/testcustomcursor.c | 4 +-
test/testdisplayinfo.c | 3 +-
test/testdraw2.c | 5 +-
test/testdrawchessboard.c | 13 +-
test/testdropfile.c | 4 +-
test/testerror.c | 6 +-
test/testevdev.c | 3 +-
test/testfile.c | 234 ++-
test/testfilesystem.c | 6 +-
test/testgamecontroller.c | 10 +-
test/testgeometry.c | 13 +-
test/testgesture.c | 6 +-
test/testgl2.c | 5 +-
test/testgles.c | 5 +-
test/testgles2.c | 32 +-
test/testgles2_sdf.c | 30 +-
test/testhaptic.c | 51 +-
test/testhittesting.c | 5 +-
test/testhotplug.c | 46 +-
test/testiconv.c | 6 +-
test/testime.c | 220 +--
test/testintersections.c | 37 +-
test/testjoystick.c | 17 +-
test/testkeys.c | 2 +-
test/testlock.c | 13 +-
test/testmessage.c | 10 +-
test/testmouse.c | 11 +-
test/testmultiaudio.c | 9 +-
test/testnative.c | 12 +-
test/testoffscreen.c | 4 +-
test/testoverlay2.c | 6 +-
test/testplatform.c | 47 +-
test/testqsort.c | 7 +-
test/testrelative.c | 25 +-
test/testrendercopyex.c | 5 +-
test/testrendertarget.c | 15 +-
test/testrumble.c | 6 +-
test/testscale.c | 5 +-
test/testsem.c | 15 +-
test/testsensor.c | 6 +-
test/testshader.c | 8 +-
test/testshape.c | 64 +-
test/testsprite2.c | 19 +-
test/teststreaming.c | 6 +-
test/testthread.c | 9 +-
test/testtimer.c | 21 +-
test/testutils.c | 2 +-
test/testver.c | 2 +-
test/testviewport.c | 8 +-
test/testvulkan.c | 40 +-
test/testwm2.c | 4 +-
test/testyuv.c | 19 +-
test/testyuv_cvt.c | 7 +-
test/torturethread.c | 4 +-
386 files changed, 6102 insertions(+), 4636 deletions(-)
diff --git a/VisualC-GDK/tests/testgdk/src/testgdk.cpp b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
index ed69ecbeab23..8395c8bb1caf 100644
--- a/VisualC-GDK/tests/testgdk/src/testgdk.cpp
+++ b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
@@ -239,17 +239,17 @@ LoadSprite(const char *file)
/* This does the SDL_LoadBMP step repeatedly, but that's OK for test code. */
sprites[i] = LoadTexture(state->renderers[i], file, SDL_TRUE, &sprite_w, &sprite_h);
if (!sprites[i]) {
- return (-1);
+ return -1;
}
if (SDL_SetTextureBlendMode(sprites[i], blendMode) < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set blend mode: %s\n", SDL_GetError());
SDL_DestroyTexture(sprites[i]);
- return (-1);
+ return -1;
}
}
/* We're ready to roll. :) */
- return (0);
+ return 0;
}
void
@@ -364,8 +364,9 @@ loop()
#endif
}
for (i = 0; i < state->num_windows; ++i) {
- if (state->windows[i] == NULL)
+ if (state->windows[i] == NULL) {
continue;
+ }
DrawSprites(state->renderers[i], sprites[i]);
}
}
@@ -382,7 +383,7 @@ main(int argc, char *argv[])
/* Initialize test framework */
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO | SDL_INIT_AUDIO);
- if (!state) {
+ if (state == NULL) {
return 1;
}
@@ -445,7 +446,7 @@ main(int argc, char *argv[])
/* Create the windows, initialize the renderers, and load the textures */
sprites =
(SDL_Texture **) SDL_malloc(state->num_windows * sizeof(*sprites));
- if (!sprites) {
+ if (sprites == NULL) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n");
quit(2);
}
diff --git a/Xcode-iOS/Demos/src/accelerometer.c b/Xcode-iOS/Demos/src/accelerometer.c
index 0af153676bd4..3ce8125134e2 100644
--- a/Xcode-iOS/Demos/src/accelerometer.c
+++ b/Xcode-iOS/Demos/src/accelerometer.c
@@ -127,7 +127,7 @@ initializeTextures(SDL_Renderer *renderer)
/* create ship texture from surface */
ship = SDL_CreateTextureFromSurface(renderer, bmp_surface);
- if (!ship) {
+ if (ship == NULL) {
fatalError("could not create ship texture");
}
SDL_SetTextureBlendMode(ship, SDL_BLENDMODE_BLEND);
@@ -145,7 +145,7 @@ initializeTextures(SDL_Renderer *renderer)
}
/* create space texture from surface */
space = SDL_CreateTextureFromSurface(renderer, bmp_surface);
- if (!space) {
+ if (space == NULL) {
fatalError("could not create space texture");
}
SDL_FreeSurface(bmp_surface);
diff --git a/Xcode-iOS/Demos/src/fireworks.c b/Xcode-iOS/Demos/src/fireworks.c
index 600d20bbb47e..eb3bb4cdeec9 100644
--- a/Xcode-iOS/Demos/src/fireworks.c
+++ b/Xcode-iOS/Demos/src/fireworks.c
@@ -84,14 +84,16 @@ stepParticles(double deltaTime)
/* is the particle actually active, or is it marked for deletion? */
if (curr->isActive) {
/* is the particle off the screen? */
- if (curr->y > screen_h)
+ if (curr->y > screen_h) {
curr->isActive = 0;
- else if (curr->y < 0)
+ } else if (curr->y < 0) {
curr->isActive = 0;
- if (curr->x > screen_w)
+ }
+ if (curr->x > screen_w) {
curr->isActive = 0;
- else if (curr->x < 0)
+ } else if (curr->x < 0) {
curr->isActive = 0;
+ }
/* step velocity, then step position */
curr->yvel += ACCEL * deltaMilliseconds;
@@ -133,15 +135,17 @@ stepParticles(double deltaTime)
}
/* if we're a dust particle, shrink our size */
- if (curr->type == dust)
+ if (curr->type == dust) {
curr->size -= deltaMilliseconds * 0.010f;
+ }
}
/* if we're still active, pack ourselves in the array next
to the last active guy (pack the array tightly) */
- if (curr->isActive)
+ if (curr->isActive) {
*(slot++) = *curr;
+ }
} /* endif (curr->isActive) */
curr++;
}
@@ -188,8 +192,9 @@ explodeEmitter(struct particle *emitter)
int i;
for (i = 0; i < 200; i++) {
- if (num_active_particles >= MAX_PARTICLES)
+ if (num_active_particles >= MAX_PARTICLES) {
return;
+ }
/* come up with a random angle and speed for new particle */
float theta = randomFloat(0, 2.0f * 3.141592);
@@ -226,8 +231,9 @@ void
spawnTrailFromEmitter(struct particle *emitter)
{
- if (num_active_particles >= MAX_PARTICLES)
+ if (num_active_particles >= MAX_PARTICLES) {
return;
+ }
/* select the particle at the slot at the end of our array */
struct particle *p = &particles[num_active_particles];
@@ -262,8 +268,9 @@ void
spawnEmitterParticle(GLfloat x, GLfloat y)
{
- if (num_active_particles >= MAX_PARTICLES)
+ if (num_active_particles >= MAX_PARTICLES) {
return;
+ }
/* find particle at endpoint of array */
struct particle *p = &particles[num_active_particles];
diff --git a/Xcode-iOS/Demos/src/happy.c b/Xcode-iOS/Demos/src/happy.c
index 73d4d4feb303..42562007e1ff 100644
--- a/Xcode-iOS/Demos/src/happy.c
+++ b/Xcode-iOS/Demos/src/happy.c
@@ -117,7 +117,7 @@ initializeTexture(SDL_Renderer *renderer)
/* convert RGBA surface to texture */
texture = SDL_CreateTextureFromSurface(renderer, bmp_surface);
- if (!texture) {
+ if (texture == NULL) {
fatalError("could not create texture");
}
SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
diff --git a/Xcode-iOS/Demos/src/keyboard.c b/Xcode-iOS/Demos/src/keyboard.c
index 4d630bae5f5c..6ab1db213aa4 100644
--- a/Xcode-iOS/Demos/src/keyboard.c
+++ b/Xcode-iOS/Demos/src/keyboard.c
@@ -165,7 +165,7 @@ loadFont(void)
{
SDL_Surface *surface = SDL_LoadBMP("kromasky_16x16.bmp");
- if (!surface) {
+ if (surface == NULL) {
printf("Error loading bitmap: %s\n", SDL_GetError());
return 0;
} else {
@@ -183,7 +183,7 @@ loadFont(void)
SDL_BlitSurface(surface, NULL, converted, NULL);
/* create our texture */
texture = SDL_CreateTextureFromSurface(renderer, converted);
- if (!texture) {
+ if (texture == NULL) {
printf("texture creation failed: %s\n", SDL_GetError());
} else {
/* set blend mode for our texture */
diff --git a/Xcode-iOS/Demos/src/mixer.c b/Xcode-iOS/Demos/src/mixer.c
index 18e33f134c8a..4c4ffbad08c0 100644
--- a/Xcode-iOS/Demos/src/mixer.c
+++ b/Xcode-iOS/Demos/src/mixer.c
@@ -207,9 +207,9 @@ playSound(struct sound *s)
break;
}
/* if this channel's sound is older than the oldest so far, set it to oldest */
- if (mixer.channels[i].timestamp <
- mixer.channels[oldest_channel].timestamp)
+ if (mixer.channels[i].timestamp < mixer.channels[oldest_channel].timestamp) {
oldest_channel = i;
+ }
}
/* no empty channels, take the oldest one */
diff --git a/Xcode-iOS/Demos/src/rectangles.c b/Xcode-iOS/Demos/src/rectangles.c
index a08f9979061e..9102cf279517 100644
--- a/Xcode-iOS/Demos/src/rectangles.c
+++ b/Xcode-iOS/Demos/src/rectangles.c
@@ -58,11 +58,11 @@ main(int argc, char *argv[])
/* create window and renderer */
window = SDL_CreateWindow(NULL, 0, 0, 320, 480, SDL_WINDOW_ALLOW_HIGHDPI);
- if (!window) {
+ if (window == NULL) {
fatalError("Could not initialize Window");
}
renderer = SDL_CreateRenderer(window, -1, 0);
- if (!renderer) {
+ if (renderer == NULL) {
fatalError("Could not create renderer");
}
diff --git a/Xcode-iOS/Demos/src/touch.c b/Xcode-iOS/Demos/src/touch.c
index 6c184630daf8..22a251be1487 100644
--- a/Xcode-iOS/Demos/src/touch.c
+++ b/Xcode-iOS/Demos/src/touch.c
@@ -63,7 +63,7 @@ initializeTexture(SDL_Renderer *renderer)
brush =
SDL_CreateTextureFromSurface(renderer, bmp_surface);
SDL_FreeSurface(bmp_surface);
- if (!brush) {
+ if (brush == NULL) {
fatalError("could not crea
(Patch may be truncated, please check the link at the top of this post.)