From a14b948b6ca6def59099b212733edb28b97ff327 Mon Sep 17 00:00:00 2001
From: Sylvain Becker <[EMAIL REDACTED]>
Date: Fri, 10 Nov 2023 15:30:56 +0100
Subject: [PATCH] [SDL2] pointer boolean (#8523)
---
VisualC-GDK/tests/testgdk/src/testgdk.cpp | 6 +-
Xcode-iOS/Demos/src/accelerometer.c | 10 +-
Xcode-iOS/Demos/src/fireworks.c | 2 +-
Xcode-iOS/Demos/src/happy.c | 4 +-
Xcode-iOS/Demos/src/keyboard.c | 4 +-
Xcode-iOS/Demos/src/rectangles.c | 4 +-
Xcode-iOS/Demos/src/touch.c | 4 +-
cmake/test/main_gui.c | 2 +-
src/SDL.c | 2 +-
src/SDL_assert.c | 16 +-
src/SDL_dataqueue.c | 30 ++--
src/SDL_error.c | 2 +-
src/SDL_guid.c | 2 +-
src/SDL_hints.c | 32 ++--
src/SDL_list.c | 4 +-
src/SDL_log.c | 12 +-
src/atomic/SDL_spinlock.c | 2 +-
src/audio/SDL_audio.c | 2 +-
src/audio/SDL_audiocvt.c | 36 ++--
src/audio/SDL_audiodev.c | 6 +-
src/audio/SDL_wave.c | 36 ++--
src/audio/aaudio/SDL_aaudio.c | 24 +--
src/audio/alsa/SDL_alsa_audio.c | 40 ++---
src/audio/android/SDL_androidaudio.c | 16 +-
src/audio/arts/SDL_artsaudio.c | 10 +-
src/audio/directsound/SDL_directsound.c | 18 +-
src/audio/disk/SDL_diskaudio.c | 14 +-
src/audio/dsp/SDL_dspaudio.c | 8 +-
src/audio/emscripten/SDL_emscriptenaudio.c | 4 +-
src/audio/esd/SDL_esdaudio.c | 10 +-
src/audio/fusionsound/SDL_fsaudio.c | 10 +-
src/audio/haiku/SDL_haikuaudio.cc | 2 +-
src/audio/jack/SDL_jackaudio.c | 12 +-
src/audio/n3ds/SDL_n3dsaudio.c | 6 +-
src/audio/nacl/SDL_naclaudio.c | 4 +-
src/audio/nas/SDL_nasaudio.c | 14 +-
src/audio/netbsd/SDL_netbsdaudio.c | 8 +-
src/audio/openslES/SDL_openslES.c | 6 +-
src/audio/os2/SDL_os2audio.c | 6 +-
src/audio/paudio/SDL_paudio.c | 12 +-
src/audio/pipewire/SDL_pipewire.c | 78 ++++-----
src/audio/ps2/SDL_ps2audio.c | 6 +-
src/audio/psp/SDL_pspaudio.c | 6 +-
src/audio/pulseaudio/SDL_pulseaudio.c | 58 +++----
src/audio/qsa/SDL_qsa_audio.c | 8 +-
src/audio/sndio/SDL_sndioaudio.c | 22 +--
src/audio/sun/SDL_sunaudio.c | 10 +-
src/audio/vita/SDL_vitaaudio.c | 6 +-
src/audio/wasapi/SDL_wasapi.c | 18 +-
src/audio/wasapi/SDL_wasapi_win32.c | 4 +-
src/audio/wasapi/SDL_wasapi_winrt.cpp | 2 +-
src/audio/winmm/SDL_winmm.c | 8 +-
src/core/android/SDL_android.c | 46 ++---
src/core/freebsd/SDL_evdev_kbd_freebsd.c | 10 +-
src/core/linux/SDL_dbus.c | 20 +--
src/core/linux/SDL_evdev.c | 38 ++--
src/core/linux/SDL_evdev_kbd.c | 18 +-
src/core/linux/SDL_fcitx.c | 2 +-
src/core/linux/SDL_ibus.c | 30 ++--
src/core/linux/SDL_ime.c | 6 +-
src/core/linux/SDL_threadprio.c | 10 +-
src/core/linux/SDL_udev.c | 88 +++++-----
src/core/openbsd/SDL_wscons_kbd.c | 8 +-
src/core/openbsd/SDL_wscons_mouse.c | 4 +-
src/core/os2/geniconv/os2cp.c | 4 +-
src/core/os2/geniconv/os2iconv.c | 8 +-
src/core/os2/geniconv/sys2utf8.c | 2 +-
src/core/windows/SDL_hid.c | 6 +-
src/core/windows/SDL_immdevice.c | 12 +-
src/core/windows/SDL_windows.c | 2 +-
src/core/windows/SDL_xinput.c | 4 +-
src/core/winrt/SDL_winrtapp_direct3d.cpp | 2 +-
src/cpuinfo/SDL_cpuinfo.c | 2 +-
src/dynapi/SDL_dynapi.c | 6 +-
src/events/SDL_displayevents.c | 2 +-
src/events/SDL_gesture.c | 14 +-
src/events/SDL_keyboard.c | 10 +-
src/events/SDL_mouse.c | 30 ++--
src/events/SDL_touch.c | 16 +-
src/events/SDL_windowevents.c | 2 +-
src/file/SDL_rwops.c | 34 ++--
src/file/n3ds/SDL_rwopsromfs.c | 2 +-
src/filesystem/android/SDL_sysfilesystem.c | 2 +-
src/filesystem/emscripten/SDL_sysfilesystem.c | 6 +-
src/filesystem/gdk/SDL_sysfilesystem.cpp | 6 +-
src/filesystem/haiku/SDL_sysfilesystem.cc | 10 +-
src/filesystem/n3ds/SDL_sysfilesystem.c | 4 +-
src/filesystem/ps2/SDL_sysfilesystem.c | 4 +-
src/filesystem/psp/SDL_sysfilesystem.c | 4 +-
src/filesystem/riscos/SDL_sysfilesystem.c | 24 +--
src/filesystem/unix/SDL_sysfilesystem.c | 42 ++---
src/filesystem/vita/SDL_sysfilesystem.c | 6 +-
src/filesystem/windows/SDL_sysfilesystem.c | 10 +-
src/filesystem/winrt/SDL_sysfilesystem.cpp | 16 +-
src/haptic/SDL_haptic.c | 8 +-
src/haptic/android/SDL_syshaptic.c | 24 +--
src/haptic/darwin/SDL_syshaptic.c | 40 ++---
src/haptic/linux/SDL_syshaptic.c | 30 ++--
src/haptic/windows/SDL_dinputhaptic.c | 36 ++--
src/haptic/windows/SDL_windowshaptic.c | 10 +-
src/haptic/windows/SDL_xinputhaptic.c | 14 +-
src/hidapi/SDL_hidapi.c | 21 ++-
src/joystick/SDL_gamecontroller.c | 112 ++++++------
src/joystick/SDL_joystick.c | 18 +-
src/joystick/android/SDL_sysjoystick.c | 26 +--
src/joystick/bsd/SDL_bsdjoystick.c | 30 ++--
src/joystick/darwin/SDL_iokitjoystick.c | 20 +--
src/joystick/emscripten/SDL_sysjoystick.c | 20 +--
src/joystick/hidapi/SDL_hidapi_gamecube.c | 6 +-
src/joystick/hidapi/SDL_hidapi_luna.c | 4 +-
src/joystick/hidapi/SDL_hidapi_ps3.c | 10 +-
src/joystick/hidapi/SDL_hidapi_ps4.c | 4 +-
src/joystick/hidapi/SDL_hidapi_ps5.c | 4 +-
src/joystick/hidapi/SDL_hidapi_rumble.c | 2 +-
src/joystick/hidapi/SDL_hidapi_shield.c | 6 +-
src/joystick/hidapi/SDL_hidapi_stadia.c | 4 +-
src/joystick/hidapi/SDL_hidapi_steam.c | 4 +-
src/joystick/hidapi/SDL_hidapi_switch.c | 8 +-
src/joystick/hidapi/SDL_hidapi_wii.c | 4 +-
src/joystick/hidapi/SDL_hidapi_xbox360.c | 4 +-
src/joystick/hidapi/SDL_hidapi_xbox360w.c | 4 +-
src/joystick/hidapi/SDL_hidapi_xboxone.c | 18 +-
src/joystick/hidapi/SDL_hidapijoystick.c | 24 +--
src/joystick/linux/SDL_sysjoystick.c | 90 +++++-----
src/joystick/os2/SDL_os2joystick.c | 2 +-
src/joystick/virtual/SDL_virtualjoystick.c | 24 +--
src/joystick/windows/SDL_dinputjoystick.c | 18 +-
src/joystick/windows/SDL_rawinputjoystick.c | 10 +-
.../windows/SDL_windows_gaming_input.c | 8 +-
src/joystick/windows/SDL_windowsjoystick.c | 14 +-
src/joystick/windows/SDL_xinputjoystick.c | 4 +-
src/loadso/dlopen/SDL_sysloadso.c | 8 +-
src/loadso/os2/SDL_sysloadso.c | 2 +-
src/loadso/windows/SDL_sysloadso.c | 8 +-
src/locale/SDL_locale.c | 4 +-
src/locale/unix/SDL_syslocale.c | 6 +-
src/locale/windows/SDL_syslocale.c | 6 +-
src/main/haiku/SDL_BeApp.cc | 6 +-
src/main/ngage/SDL_ngage_main.cpp | 2 +-
src/main/windows/SDL_windows_main.c | 6 +-
src/misc/SDL_url.c | 2 +-
src/misc/windows/SDL_sysurl.c | 2 +-
src/power/SDL_power.c | 4 +-
src/power/linux/SDL_syspower.c | 10 +-
src/render/SDL_render.c | 152 ++++++++--------
src/render/SDL_yuv_sw.c | 2 +-
src/render/direct3d/SDL_render_d3d.c | 44 ++---
src/render/direct3d11/SDL_render_d3d11.c | 42 ++---
src/render/direct3d11/SDL_render_winrt.cpp | 2 +-
src/render/direct3d12/SDL_render_d3d12.c | 34 ++--
src/render/opengl/SDL_render_gl.c | 32 ++--
src/render/opengl/SDL_shaders_gl.c | 2 +-
src/render/opengles/SDL_render_gles.c | 22 +--
src/render/opengles2/SDL_render_gles2.c | 40 ++---
src/render/ps2/SDL_render_ps2.c | 16 +-
src/render/psp/SDL_render_psp.c | 42 ++---
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 | 68 ++++----
src/render/software/SDL_rotate.c | 6 +-
src/render/software/SDL_triangle.c | 6 +-
src/render/vitagxm/SDL_render_vita_gxm.c | 24 +--
.../vitagxm/SDL_render_vita_gxm_memory.c | 8 +-
.../vitagxm/SDL_render_vita_gxm_tools.c | 6 +-
src/sensor/SDL_sensor.c | 4 +-
src/sensor/android/SDL_androidsensor.c | 10 +-
src/sensor/vita/SDL_vitasensor.c | 4 +-
src/sensor/windows/SDL_windowssensor.c | 8 +-
src/stdlib/SDL_getenv.c | 22 +--
src/stdlib/SDL_iconv.c | 28 +--
src/stdlib/SDL_string.c | 10 +-
src/test/SDL_test_common.c | 14 +-
src/test/SDL_test_compare.c | 2 +-
src/test/SDL_test_crc32.c | 12 +-
src/test/SDL_test_font.c | 8 +-
src/test/SDL_test_fuzzer.c | 2 +-
src/test/SDL_test_harness.c | 34 ++--
src/test/SDL_test_md5.c | 8 +-
src/test/SDL_test_memory.c | 6 +-
src/test/SDL_test_random.c | 6 +-
src/thread/SDL_thread.c | 34 ++--
src/thread/generic/SDL_syscond.c | 6 +-
src/thread/generic/SDL_sysmutex.c | 2 +-
src/thread/generic/SDL_syssem.c | 8 +-
src/thread/n3ds/SDL_syscond.c | 8 +-
src/thread/n3ds/SDL_sysmutex.c | 2 +-
src/thread/n3ds/SDL_syssem.c | 10 +-
src/thread/n3ds/SDL_systhread.c | 2 +-
src/thread/ngage/SDL_syssem.cpp | 10 +-
src/thread/os2/SDL_syssem.c | 8 +-
src/thread/os2/SDL_systhread.c | 2 +-
src/thread/os2/SDL_systls.c | 6 +-
src/thread/ps2/SDL_syssem.c | 10 +-
src/thread/psp/SDL_syscond.c | 6 +-
src/thread/psp/SDL_sysmutex.c | 2 +-
src/thread/psp/SDL_syssem.c | 10 +-
src/thread/pthread/SDL_syscond.c | 8 +-
src/thread/pthread/SDL_sysmutex.c | 2 +-
src/thread/pthread/SDL_syssem.c | 14 +-
src/thread/pthread/SDL_systhread.c | 4 +-
src/thread/stdcpp/SDL_syscond.cpp | 6 +-
src/thread/stdcpp/SDL_sysmutex.cpp | 4 +-
src/thread/vita/SDL_syscond.c | 10 +-
src/thread/vita/SDL_sysmutex.c | 8 +-
src/thread/vita/SDL_syssem.c | 10 +-
src/thread/windows/SDL_syscond_cv.c | 16 +-
src/thread/windows/SDL_sysmutex.c | 12 +-
src/thread/windows/SDL_syssem.c | 26 +--
src/thread/windows/SDL_systhread.c | 8 +-
src/timer/SDL_timer.c | 8 +-
src/video/SDL_RLEaccel.c | 14 +-
src/video/SDL_blit.c | 6 +-
src/video/SDL_blit_A.c | 6 +-
src/video/SDL_blit_N.c | 8 +-
src/video/SDL_bmp.c | 8 +-
src/video/SDL_clipboard.c | 20 +--
src/video/SDL_egl.c | 50 +++---
src/video/SDL_fillrect.c | 14 +-
src/video/SDL_pixels.c | 36 ++--
src/video/SDL_rect.c | 4 +-
src/video/SDL_rect_impl.h | 32 ++--
src/video/SDL_shape.c | 20 +--
src/video/SDL_surface.c | 72 ++++----
src/video/SDL_video.c | 162 +++++++++---------
src/video/SDL_vulkan_utils.c | 14 +-
src/video/SDL_yuv.c | 10 +-
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 | 4 +-
src/video/android/SDL_androidvulkan.c | 6 +-
src/video/android/SDL_androidwindow.c | 4 +-
src/video/directfb/SDL_DirectFB_WM.c | 8 +-
src/video/directfb/SDL_DirectFB_dyn.c | 2 +-
src/video/directfb/SDL_DirectFB_events.c | 4 +-
src/video/directfb/SDL_DirectFB_opengl.c | 16 +-
src/video/directfb/SDL_DirectFB_shape.c | 4 +-
src/video/dummy/SDL_nullframebuffer.c | 4 +-
src/video/dummy/SDL_nullvideo.c | 2 +-
src/video/emscripten/SDL_emscriptenevents.c | 4 +-
.../emscripten/SDL_emscriptenframebuffer.c | 4 +-
src/video/emscripten/SDL_emscriptenmouse.c | 8 +-
src/video/emscripten/SDL_emscriptenvideo.c | 4 +-
src/video/haiku/SDL_bclipboard.cc | 2 +-
src/video/haiku/SDL_bframebuffer.cc | 2 +-
src/video/haiku/SDL_bmessagebox.cc | 8 +-
src/video/haiku/SDL_bopengl.cc | 8 +-
src/video/haiku/SDL_bvideo.cc | 8 +-
src/video/haiku/SDL_bwindow.cc | 2 +-
src/video/kmsdrm/SDL_kmsdrmdyn.c | 12 +-
src/video/kmsdrm/SDL_kmsdrmmouse.c | 14 +-
src/video/kmsdrm/SDL_kmsdrmopengles.c | 2 +-
src/video/kmsdrm/SDL_kmsdrmvideo.c | 38 ++--
src/video/kmsdrm/SDL_kmsdrmvulkan.c | 6 +-
src/video/n3ds/SDL_n3dsframebuffer.c | 4 +-
src/video/n3ds/SDL_n3dsvideo.c | 10 +-
src/video/ngage/SDL_ngageframebuffer.cpp | 4 +-
src/video/ngage/SDL_ngagevideo.cpp | 4 +-
src/video/ngage/SDL_ngagewindow.cpp | 2 +-
.../offscreen/SDL_offscreenframebuffer.c | 4 +-
src/video/offscreen/SDL_offscreenvideo.c | 2 +-
src/video/offscreen/SDL_offscreenwindow.c | 2 +-
src/video/os2/SDL_os2dive.c | 8 +-
src/video/os2/SDL_os2messagebox.c | 20 +--
src/video/os2/SDL_os2mouse.c | 10 +-
src/video/os2/SDL_os2util.c | 2 +-
src/video/os2/SDL_os2video.c | 82 ++++-----
src/video/os2/SDL_os2vman.c | 22 +--
src/video/pandora/SDL_pandora.c | 22 +--
src/video/ps2/SDL_ps2video.c | 2 +-
src/video/psp/SDL_pspvideo.c | 10 +-
src/video/qnx/gl.c | 2 +-
src/video/qnx/video.c | 4 +-
src/video/raspberry/SDL_rpimouse.c | 26 +--
src/video/raspberry/SDL_rpivideo.c | 8 +-
src/video/riscos/SDL_riscosframebuffer.c | 4 +-
src/video/riscos/SDL_riscosmodes.c | 12 +-
src/video/riscos/SDL_riscosvideo.c | 4 +-
src/video/riscos/SDL_riscoswindow.c | 4 +-
src/video/vita/SDL_vitaframebuffer.c | 2 +-
src/video/vita/SDL_vitagl_pvr.c | 4 +-
src/video/vita/SDL_vitagles_pvr.c | 4 +-
src/video/vita/SDL_vitakeyboard.c | 2 +-
src/video/vita/SDL_vitamouse.c | 2 +-
src/video/vita/SDL_vitatouch.c | 2 +-
src/video/vita/SDL_vitavideo.c | 10 +-
src/video/vivante/SDL_vivantevideo.c | 10 +-
src/video/vivante/SDL_vivantevulkan.c | 6 +-
src/video/wayland/SDL_waylandclipboard.c | 28 +--
src/video/wayland/SDL_waylanddatamanager.c | 84 ++++-----
src/video/wayland/SDL_waylanddyn.c | 12 +-
src/video/wayland/SDL_waylandevents.c | 118 ++++++-------
src/video/wayland/SDL_waylandkeyboard.c | 12 +-
src/video/wayland/SDL_waylandmessagebox.c | 14 +-
src/video/wayland/SDL_waylandmouse.c | 26 +--
src/video/wayland/SDL_waylandtouch.c | 2 +-
src/video/wayland/SDL_waylandtouch.h | 2 +-
src/video/wayland/SDL_waylandvideo.c | 28 +--
src/video/wayland/SDL_waylandvulkan.c | 6 +-
src/video/wayland/SDL_waylandwindow.c | 58 +++----
src/video/windows/SDL_windowsclipboard.c | 2 +-
src/video/windows/SDL_windowsevents.c | 12 +-
src/video/windows/SDL_windowsframebuffer.c | 2 +-
src/video/windows/SDL_windowskeyboard.c | 20 +--
src/video/windows/SDL_windowsmessagebox.c | 32 ++--
src/video/windows/SDL_windowsmodes.c | 18 +-
src/video/windows/SDL_windowsmouse.c | 4 +-
src/video/windows/SDL_windowsopengl.c | 14 +-
src/video/windows/SDL_windowsopengles.c | 4 +-
src/video/windows/SDL_windowsshape.c | 14 +-
src/video/windows/SDL_windowsvideo.c | 10 +-
src/video/windows/SDL_windowsvulkan.c | 6 +-
src/video/windows/SDL_windowswindow.c | 14 +-
src/video/winrt/SDL_winrtgamebar.cpp | 6 +-
src/video/winrt/SDL_winrtvideo.cpp | 8 +-
src/video/x11/SDL_x11clipboard.c | 2 +-
src/video/x11/SDL_x11dyn.c | 12 +-
src/video/x11/SDL_x11events.c | 12 +-
src/video/x11/SDL_x11framebuffer.c | 4 +-
src/video/x11/SDL_x11keyboard.c | 2 +-
src/video/x11/SDL_x11messagebox.c | 20 +--
src/video/x11/SDL_x11modes.c | 34 ++--
src/video/x11/SDL_x11mouse.c | 10 +-
src/video/x11/SDL_x11shape.c | 12 +-
src/video/x11/SDL_x11video.c | 12 +-
src/video/x11/SDL_x11vulkan.c | 8 +-
src/video/x11/SDL_x11window.c | 28 +--
src/video/x11/SDL_x11xfixes.c | 2 +-
src/video/x11/SDL_x11xinput2.c | 18 +-
test/checkkeys.c | 4 +-
test/checkkeysthreads.c | 2 +-
test/controllermap.c | 11 +-
test/loopwave.c | 2 +-
test/loopwavequeue.c | 2 +-
test/testaudiohotplug.c | 4 +-
test/testaudioinfo.c | 6 +-
test/testautomation.c | 2 +-
test/testautomation_mouse.c | 6 +-
test/testautomation_render.c | 12 +-
test/testautomation_stdlib.c | 4 +-
test/testautomation_surface.c | 10 +-
test/testautomation_video.c | 30 ++--
test/testcustomcursor.c | 2 +-
test/testdisplayinfo.c | 2 +-
test/testdraw2.c | 2 +-
test/testdrawchessboard.c | 4 +-
test/testdropfile.c | 2 +-
test/testerror.c | 2 +-
test/testfile.c | 18 +-
test/testfilesystem.c | 6 +-
test/testgamecontroller.c | 17 +-
test/testgeometry.c | 4 +-
test/testgesture.c | 4 +-
test/testgl2.c | 2 +-
test/testgles.c | 6 +-
test/testgles2.c | 6 +-
test/testgles2_sdf.c | 12 +-
test/testhaptic.c | 6 +-
test/testhittesting.c | 2 +-
test/testhotplug.c | 2 +-
test/testiconv.c | 2 +-
test/testime.c | 24 +--
test/testintersections.c | 2 +-
test/testjoystick.c | 6 +-
test/testloadso.c | 4 +-
test/testlocale.c | 2 +-
test/testlock.c | 2 +-
test/testmouse.c | 14 +-
test/testnative.c | 14 +-
test/testnativew32.c | 2 +-
test/testoffscreen.c | 4 +-
test/testoverlay2.c | 12 +-
test/testplatform.c | 2 +-
test/testrelative.c | 2 +-
test/testrendercopyex.c | 2 +-
test/testrendertarget.c | 4 +-
test/testresample.c | 4 +-
test/testrumble.c | 6 +-
test/testscale.c | 2 +-
test/testsensor.c | 4 +-
test/testshader.c | 10 +-
test/testshape.c | 6 +-
test/testsprite2.c | 6 +-
test/testspriteminimal.c | 2 +-
test/teststreaming.c | 10 +-
test/testthread.c | 4 +-
test/testutils.c | 20 +--
test/testviewport.c | 4 +-
test/testvulkan.c | 12 +-
test/testwm2.c | 6 +-
test/testyuv.c | 12 +-
394 files changed, 2564 insertions(+), 2559 deletions(-)
diff --git a/VisualC-GDK/tests/testgdk/src/testgdk.cpp b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
index 6aea4cc3e6ea..fd86d628c04f 100644
--- a/VisualC-GDK/tests/testgdk/src/testgdk.cpp
+++ b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
@@ -383,7 +383,7 @@ main(int argc, char *argv[])
/* Initialize test framework */
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO | SDL_INIT_AUDIO);
- if (state == NULL) {
+ if (!state) {
return 1;
}
@@ -446,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 == NULL) {
+ if (!sprites) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n");
quit(2);
}
@@ -461,7 +461,7 @@ main(int argc, char *argv[])
soundname = GetResourceFilename(argc > 1 ? argv[1] : NULL, "sample.wav");
- if (soundname == NULL) {
+ if (!soundname) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "%s\n", SDL_GetError());
quit(1);
}
diff --git a/Xcode-iOS/Demos/src/accelerometer.c b/Xcode-iOS/Demos/src/accelerometer.c
index 3ce8125134e2..4c166a621ceb 100644
--- a/Xcode-iOS/Demos/src/accelerometer.c
+++ b/Xcode-iOS/Demos/src/accelerometer.c
@@ -118,7 +118,7 @@ initializeTextures(SDL_Renderer *renderer)
/* load the ship */
bmp_surface = SDL_LoadBMP("ship.bmp");
- if (bmp_surface == NULL) {
+ if (!bmp_surface) {
fatalError("could not ship.bmp");
}
/* set blue to transparent on the ship */
@@ -127,7 +127,7 @@ initializeTextures(SDL_Renderer *renderer)
/* create ship texture from surface */
ship = SDL_CreateTextureFromSurface(renderer, bmp_surface);
- if (ship == NULL) {
+ if (!ship) {
fatalError("could not create ship texture");
}
SDL_SetTextureBlendMode(ship, SDL_BLENDMODE_BLEND);
@@ -140,12 +140,12 @@ initializeTextures(SDL_Renderer *renderer)
/* load the space background */
bmp_surface = SDL_LoadBMP("space.bmp");
- if (bmp_surface == NULL) {
+ if (!bmp_surface) {
fatalError("could not load space.bmp");
}
/* create space texture from surface */
space = SDL_CreateTextureFromSurface(renderer, bmp_surface);
- if (space == NULL) {
+ if (!space) {
fatalError("could not create space texture");
}
SDL_FreeSurface(bmp_surface);
@@ -179,7 +179,7 @@ main(int argc, char *argv[])
printf("There are %d joysticks available\n", SDL_NumJoysticks());
printf("Default joystick (index 0) is %s\n", SDL_JoystickName(0));
accelerometer = SDL_JoystickOpen(0);
- if (accelerometer == NULL) {
+ if (!accelerometer) {
fatalError("Could not open joystick (accelerometer)");
}
printf("joystick number of axis = %d\n",
diff --git a/Xcode-iOS/Demos/src/fireworks.c b/Xcode-iOS/Demos/src/fireworks.c
index eb3bb4cdeec9..a9af3fb583aa 100644
--- a/Xcode-iOS/Demos/src/fireworks.c
+++ b/Xcode-iOS/Demos/src/fireworks.c
@@ -334,7 +334,7 @@ initializeTexture()
to format passed into OpenGL */
bmp_surface = SDL_LoadBMP("stroke.bmp");
- if (bmp_surface == NULL) {
+ if (!bmp_surface) {
fatalError("could not load stroke.bmp");
}
diff --git a/Xcode-iOS/Demos/src/happy.c b/Xcode-iOS/Demos/src/happy.c
index 42562007e1ff..163d3463f536 100644
--- a/Xcode-iOS/Demos/src/happy.c
+++ b/Xcode-iOS/Demos/src/happy.c
@@ -108,7 +108,7 @@ initializeTexture(SDL_Renderer *renderer)
SDL_Surface *bmp_surface;
/* load the bmp */
bmp_surface = SDL_LoadBMP("icon.bmp");
- if (bmp_surface == NULL) {
+ if (!bmp_surface) {
fatalError("could not load bmp");
}
/* set white to transparent on the happyface */
@@ -117,7 +117,7 @@ initializeTexture(SDL_Renderer *renderer)
/* convert RGBA surface to texture */
texture = SDL_CreateTextureFromSurface(renderer, bmp_surface);
- if (texture == NULL) {
+ if (!texture) {
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 6ab1db213aa4..4d630bae5f5c 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 == NULL) {
+ if (!surface) {
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 == NULL) {
+ if (!texture) {
printf("texture creation failed: %s\n", SDL_GetError());
} else {
/* set blend mode for our texture */
diff --git a/Xcode-iOS/Demos/src/rectangles.c b/Xcode-iOS/Demos/src/rectangles.c
index 9102cf279517..a08f9979061e 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 == NULL) {
+ if (!window) {
fatalError("Could not initialize Window");
}
renderer = SDL_CreateRenderer(window, -1, 0);
- if (renderer == NULL) {
+ if (!renderer) {
fatalError("Could not create renderer");
}
diff --git a/Xcode-iOS/Demos/src/touch.c b/Xcode-iOS/Demos/src/touch.c
index 22a251be1487..4b7ff95484d5 100644
--- a/Xcode-iOS/Demos/src/touch.c
+++ b/Xcode-iOS/Demos/src/touch.c
@@ -57,13 +57,13 @@ initializeTexture(SDL_Renderer *renderer)
{
SDL_Surface *bmp_surface;
bmp_surface = SDL_LoadBMP("stroke.bmp");
- if (bmp_surface == NULL) {
+ if (!bmp_surface) {
fatalError("could not load stroke.bmp");
}
brush =
SDL_CreateTextureFromSurface(renderer, bmp_surface);
SDL_FreeSurface(bmp_surface);
- if (brush == NULL) {
+ if (!brush) {
fatalError("could not create brush texture");
}
/* additive blending -- laying strokes on top of eachother makes them brighter */
diff --git a/cmake/test/main_gui.c b/cmake/test/main_gui.c
index 4ffe9be1c407..ca2d92ecd48e 100644
--- a/cmake/test/main_gui.c
+++ b/cmake/test/main_gui.c
@@ -14,7 +14,7 @@ int main(int argc, char *argv[]) {
640, 480,
SDL_WINDOW_SHOWN
);
- if (window == NULL) {
+ if (!window) {
fprintf(stderr, "could not create window: %s\n", SDL_GetError());
return 1;
}
diff --git a/src/SDL.c b/src/SDL.c
index da3a4ccce5e9..14dbd0326f1e 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -533,7 +533,7 @@ void SDL_GetVersion(SDL_version *ver)
static SDL_bool check_hint = SDL_TRUE;
static SDL_bool legacy_version = SDL_FALSE;
- if (ver == NULL) {
+ if (!ver) {
return;
}
diff --git a/src/SDL_assert.c b/src/SDL_assert.c
index fe7619be1c84..57cd47762ba5 100644
--- a/src/SDL_assert.c
+++ b/src/SDL_assert.c
@@ -114,11 +114,11 @@ static void SDL_GenerateAssertionReport(void)
const SDL_assert_data *item = triggered_assertions;
/* only do this if the app hasn't assigned an assertion handler. */
- if ((item != NULL) && (assertion_handler != SDL_PromptAssertion)) {
+ if ((item) && (assertion_handler != SDL_PromptAssertion)) {
debug_print("\n\nSDL assertion report.\n");
debug_print("All SDL assertions between last init/quit:\n\n");
- while (item != NULL) {
+ while (item) {
debug_print(
"'%s'\n"
" * %s (%s:%d)\n"
@@ -206,7 +206,7 @@ static SDL_assert_state SDLCALL SDL_PromptAssertion(const SDL_assert_data *data,
/* let env. variable override, so unit tests won't block in a GUI. */
envr = SDL_getenv("SDL_ASSERT");
- if (envr != NULL) {
+ if (envr) {
if (message != stack_buf) {
SDL_free(message);
}
@@ -342,9 +342,9 @@ SDL_assert_state SDL_ReportAssertion(SDL_assert_data *data, const char *func, co
#ifndef SDL_THREADS_DISABLED
static SDL_SpinLock spinlock = 0;
SDL_AtomicLock(&spinlock);
- if (assertion_mutex == NULL) { /* never called SDL_Init()? */
+ if (!assertion_mutex) { /* never called SDL_Init()? */
assertion_mutex = SDL_CreateMutex();
- if (assertion_mutex == NULL) {
+ if (!assertion_mutex) {
SDL_AtomicUnlock(&spinlock);
return SDL_ASSERTION_IGNORE; /* oh well, I guess. */
}
@@ -409,7 +409,7 @@ void SDL_AssertionsQuit(void)
#if SDL_ASSERT_LEVEL > 0
SDL_GenerateAssertionReport();
#ifndef SDL_THREADS_DISABLED
- if (assertion_mutex != NULL) {
+ if (assertion_mutex) {
SDL_DestroyMutex(assertion_mutex);
assertion_mutex = NULL;
}
@@ -437,7 +437,7 @@ void SDL_ResetAssertionReport(void)
{
SDL_assert_data *next = NULL;
SDL_ass
(Patch may be truncated, please check the link at the top of this post.)