From 3f1fd5abff18c5b4d69d60e23284e39dbd6223ff Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 23 May 2023 10:59:03 -0700
Subject: [PATCH] Updated source to match SDL function prototype style
---
src/SDL.c | 19 +--
src/SDL_assert.c | 4 +-
src/SDL_dataqueue.c | 6 +-
src/SDL_error.c | 6 +-
src/SDL_hints.c | 19 +--
src/SDL_log.c | 3 +-
src/atomic/SDL_atomic.c | 12 +-
src/atomic/SDL_spinlock.c | 3 +-
src/audio/SDL_audio.c | 33 ++--
src/audio/SDL_audiocvt.c | 3 +-
src/audio/SDL_wave.c | 3 +-
src/audio/arts/SDL_artsaudio.c | 36 ++--
src/audio/esd/SDL_esdaudio.c | 36 ++--
src/audio/fusionsound/SDL_fsaudio.c | 33 ++--
src/audio/nacl/SDL_naclaudio.c | 13 +-
src/audio/nas/SDL_nasaudio.c | 51 ++----
src/audio/paudio/SDL_paudio.c | 24 +--
src/audio/qsa/SDL_qsa_audio.c | 33 ++--
src/audio/sun/SDL_sunaudio.c | 27 +--
src/audio/winmm/SDL_winmm.c | 41 ++---
src/core/freebsd/SDL_evdev_kbd_freebsd.c | 3 +-
src/core/linux/SDL_dbus.c | 24 +--
src/core/linux/SDL_evdev_kbd.c | 6 +-
src/core/linux/SDL_fcitx.c | 9 +-
src/core/linux/SDL_ibus.c | 14 +-
src/core/linux/SDL_ime.c | 6 +-
src/core/linux/SDL_udev.c | 6 +-
src/core/windows/SDL_immdevice.c | 3 +-
src/core/windows/SDL_windows.c | 9 +-
src/cpuinfo/SDL_cpuinfo.c | 54 ++----
src/dynapi/SDL_dynapi.c | 3 +-
src/events/SDL_keyboard.c | 33 ++--
src/events/SDL_keysym_to_scancode.c | 3 +-
src/events/SDL_mouse.c | 36 ++--
src/events/SDL_touch.c | 15 +-
src/file/SDL_rwops.c | 51 ++----
src/file/n3ds/SDL_rwopsromfs.c | 23 +--
src/filesystem/android/SDL_sysfilesystem.c | 6 +-
src/filesystem/cocoa/SDL_sysfilesystem.m | 6 +-
src/filesystem/dummy/SDL_sysfilesystem.c | 6 +-
src/filesystem/emscripten/SDL_sysfilesystem.c | 6 +-
src/filesystem/haiku/SDL_sysfilesystem.cc | 6 +-
src/filesystem/n3ds/SDL_sysfilesystem.c | 6 +-
src/filesystem/nacl/SDL_sysfilesystem.c | 6 +-
src/filesystem/os2/SDL_sysfilesystem.c | 6 +-
src/filesystem/ps2/SDL_sysfilesystem.c | 6 +-
src/filesystem/psp/SDL_sysfilesystem.c | 6 +-
src/filesystem/riscos/SDL_sysfilesystem.c | 6 +-
src/filesystem/unix/SDL_sysfilesystem.c | 9 +-
src/filesystem/vita/SDL_sysfilesystem.c | 6 +-
src/filesystem/windows/SDL_sysfilesystem.c | 12 +-
src/haptic/SDL_haptic.c | 15 +-
src/haptic/android/SDL_syshaptic.c | 3 +-
src/haptic/darwin/SDL_syshaptic.c | 3 +-
src/haptic/dummy/SDL_syshaptic.c | 3 +-
src/haptic/linux/SDL_syshaptic.c | 3 +-
src/haptic/windows/SDL_windowshaptic.c | 3 +-
src/hidapi/SDL_hidapi.c | 27 +--
src/joystick/darwin/SDL_iokitjoystick.c | 6 +-
src/joystick/hidapi/SDL_hidapi_switch.c | 3 +-
src/joystick/hidapi/SDL_hidapijoystick.c | 9 +-
src/joystick/iphoneos/SDL_mfijoystick.m | 6 +-
src/joystick/windows/SDL_dinputjoystick.c | 12 +-
src/joystick/windows/SDL_rawinputjoystick.c | 9 +-
src/joystick/windows/SDL_xinputjoystick.c | 6 +-
src/loadso/dlopen/SDL_sysloadso.c | 6 +-
src/loadso/dummy/SDL_sysloadso.c | 6 +-
src/loadso/os2/SDL_sysloadso.c | 9 +-
src/loadso/windows/SDL_sysloadso.c | 6 +-
src/locale/SDL_locale.c | 3 +-
src/locale/haiku/SDL_syslocale.cc | 3 +-
src/main/haiku/SDL_BeApp.cc | 9 +-
src/main/nacl/SDL_nacl_main.c | 21 ++-
src/misc/haiku/SDL_sysurl.cc | 3 +-
src/power/SDL_power.c | 3 +-
src/power/android/SDL_syspower.c | 3 +-
src/power/emscripten/SDL_syspower.c | 3 +-
src/power/haiku/SDL_syspower.c | 3 +-
src/power/linux/SDL_syspower.c | 14 +-
src/power/macosx/SDL_syspower.c | 3 +-
src/power/n3ds/SDL_syspower.c | 9 +-
src/power/psp/SDL_syspower.c | 4 +-
src/power/uikit/SDL_syspower.m | 3 +-
src/power/vita/SDL_syspower.c | 4 +-
src/power/windows/SDL_syspower.c | 3 +-
src/power/winrt/SDL_syspower.cpp | 3 +-
src/render/SDL_render.c | 64 +++----
src/render/SDL_yuv_sw.c | 3 +-
src/render/direct3d/SDL_render_d3d.c | 6 +-
src/render/direct3d11/SDL_render_d3d11.c | 9 +-
src/render/direct3d12/SDL_render_d3d12.c | 6 +-
src/render/metal/SDL_render_metal.m | 130 +++++---------
src/render/opengl/SDL_shaders_gl.c | 3 +-
src/render/psp/SDL_render_psp.c | 3 +-
src/render/software/SDL_render_sw.c | 3 +-
src/render/software/SDL_rotate.c | 3 +-
src/render/vitagxm/SDL_render_vita_gxm.c | 3 +-
.../vitagxm/SDL_render_vita_gxm_memory.c | 12 +-
.../vitagxm/SDL_render_vita_gxm_tools.c | 12 +-
src/stdlib/SDL_getenv.c | 9 +-
src/stdlib/SDL_iconv.c | 13 +-
src/stdlib/SDL_qsort.c | 6 +-
src/stdlib/SDL_stdlib.c | 6 +-
src/stdlib/SDL_string.c | 93 ++++------
src/test/SDL_test_common.c | 12 +-
src/test/SDL_test_fuzzer.c | 48 ++----
src/test/SDL_test_harness.c | 3 +-
src/test/SDL_test_log.c | 3 +-
src/thread/SDL_thread.c | 33 ++--
src/thread/generic/SDL_syscond.c | 3 +-
src/thread/generic/SDL_sysmutex.c | 3 +-
src/thread/generic/SDL_syssem.c | 12 +-
src/thread/generic/SDL_systhread.c | 3 +-
src/thread/generic/SDL_systls.c | 3 +-
src/thread/n3ds/SDL_syscond.c | 3 +-
src/thread/n3ds/SDL_sysmutex.c | 3 +-
src/thread/n3ds/SDL_systhread.c | 6 +-
src/thread/ngage/SDL_sysmutex.cpp | 6 +-
src/thread/ngage/SDL_syssem.cpp | 6 +-
src/thread/ngage/SDL_systhread.cpp | 3 +-
src/thread/os2/SDL_sysmutex.c | 15 +-
src/thread/os2/SDL_syssem.c | 21 +--
src/thread/os2/SDL_systhread.c | 18 +-
src/thread/psp/SDL_syscond.c | 3 +-
src/thread/psp/SDL_sysmutex.c | 3 +-
src/thread/pthread/SDL_syscond.c | 3 +-
src/thread/pthread/SDL_sysmutex.c | 3 +-
src/thread/pthread/SDL_syssem.c | 6 +-
src/thread/pthread/SDL_systhread.c | 3 +-
src/thread/pthread/SDL_systls.c | 3 +-
src/thread/vita/SDL_syscond.c | 3 +-
src/thread/vita/SDL_sysmutex.c | 3 +-
src/thread/windows/SDL_syscond_cv.c | 3 +-
src/thread/windows/SDL_sysmutex.c | 3 +-
src/thread/windows/SDL_syssem.c | 6 +-
src/thread/windows/SDL_systhread.c | 3 +-
src/thread/windows/SDL_systls.c | 3 +-
src/timer/SDL_timer.c | 15 +-
src/timer/dummy/SDL_systimer.c | 9 +-
src/timer/haiku/SDL_systimer.c | 9 +-
src/timer/n3ds/SDL_systimer.c | 9 +-
src/timer/ngage/SDL_systimer.cpp | 9 +-
src/timer/os2/SDL_systimer.c | 18 +-
src/timer/ps2/SDL_systimer.c | 9 +-
src/timer/psp/SDL_systimer.c | 9 +-
src/timer/unix/SDL_systimer.c | 9 +-
src/timer/vita/SDL_systimer.c | 9 +-
src/timer/windows/SDL_systimer.c | 9 +-
src/video/SDL_blit_0.c | 3 +-
src/video/SDL_blit_1.c | 3 +-
src/video/SDL_blit_A.c | 3 +-
src/video/SDL_blit_N.c | 9 +-
src/video/SDL_bmp.c | 3 +-
src/video/SDL_clipboard.c | 12 +-
src/video/SDL_egl.c | 9 +-
src/video/SDL_pixels.c | 31 ++--
src/video/SDL_rect.c | 3 +-
src/video/SDL_rect_impl.h | 10 +-
src/video/SDL_shape.c | 9 +-
src/video/SDL_stretch.c | 6 +-
src/video/SDL_surface.c | 33 ++--
src/video/SDL_video.c | 159 ++++++------------
src/video/android/SDL_androidclipboard.c | 3 +-
src/video/android/SDL_androidgl.c | 3 +-
src/video/android/SDL_androidkeyboard.c | 6 +-
src/video/android/SDL_androidwindow.c | 3 +-
src/video/cocoa/SDL_cocoaclipboard.m | 12 +-
src/video/cocoa/SDL_cocoaevents.m | 34 ++--
src/video/cocoa/SDL_cocoakeyboard.m | 29 ++--
src/video/cocoa/SDL_cocoamessagebox.m | 6 +-
src/video/cocoa/SDL_cocoametalview.m | 12 +-
src/video/cocoa/SDL_cocoamodes.m | 48 ++----
src/video/cocoa/SDL_cocoamouse.m | 54 ++----
src/video/cocoa/SDL_cocoaopengl.m | 32 ++--
src/video/cocoa/SDL_cocoaopengles.m | 18 +-
src/video/cocoa/SDL_cocoashape.m | 12 +-
src/video/cocoa/SDL_cocoavideo.m | 15 +-
src/video/cocoa/SDL_cocoawindow.m | 141 ++++++----------
src/video/directfb/SDL_DirectFB_WM.c | 27 +--
src/video/directfb/SDL_DirectFB_dyn.c | 14 +-
src/video/directfb/SDL_DirectFB_events.c | 46 ++---
src/video/directfb/SDL_DirectFB_modes.c | 29 +---
src/video/directfb/SDL_DirectFB_mouse.c | 41 ++---
src/video/directfb/SDL_DirectFB_opengl.c | 42 ++---
src/video/directfb/SDL_DirectFB_render.c | 82 +++------
src/video/directfb/SDL_DirectFB_shape.c | 12 +-
src/video/directfb/SDL_DirectFB_video.c | 21 +--
src/video/directfb/SDL_DirectFB_window.c | 54 ++----
src/video/emscripten/SDL_emscriptenopengles.c | 8 +-
src/video/haiku/SDL_bmessagebox.cc | 3 +-
src/video/kmsdrm/SDL_kmsdrmvideo.c | 18 +-
src/video/n3ds/SDL_n3dsswkb.c | 3 +-
src/video/nacl/SDL_naclevents.c | 3 +-
src/video/nacl/SDL_naclopengles.c | 49 +++---
src/video/nacl/SDL_naclvideo.c | 46 +++--
src/video/nacl/SDL_naclwindow.c | 17 +-
src/video/offscreen/SDL_offscreenopengles.c | 3 +-
src/video/pandora/SDL_pandora.c | 90 ++++------
src/video/pandora/SDL_pandora_events.c | 3 +-
src/video/psp/SDL_pspgl.c | 6 +-
src/video/psp/SDL_pspvideo.c | 3 +-
src/video/qnx/gl.c | 30 ++--
src/video/qnx/keyboard.c | 3 +-
src/video/qnx/video.c | 36 ++--
src/video/raspberry/SDL_rpivideo.c | 3 +-
src/video/riscos/SDL_riscosmodes.c | 3 +-
src/video/riscos/SDL_riscoswindow.c | 3 +-
src/video/uikit/SDL_uikitappdelegate.m | 3 +-
src/video/uikit/SDL_uikitclipboard.m | 15 +-
src/video/uikit/SDL_uikitevents.m | 6 +-
src/video/uikit/SDL_uikitmessagebox.m | 15 +-
src/video/uikit/SDL_uikitmetalview.m | 18 +-
src/video/uikit/SDL_uikitmodes.m | 45 ++---
src/video/uikit/SDL_uikitopengles.m | 21 +--
src/video/uikit/SDL_uikitvideo.m | 21 +--
src/video/uikit/SDL_uikitviewcontroller.m | 18 +-
src/video/uikit/SDL_uikitwindow.m | 48 ++----
src/video/vita/SDL_vitagl_pvr.c | 6 +-
src/video/vita/SDL_vitagles.c | 6 +-
src/video/vita/SDL_vitagles_pvr.c | 7 +-
src/video/vita/SDL_vitavideo.c | 3 +-
src/video/vivante/SDL_vivantevideo.c | 3 +-
src/video/wayland/SDL_waylanddatamanager.c | 11 +-
src/video/wayland/SDL_waylandmouse.c | 3 +-
src/video/wayland/SDL_waylandwindow.c | 6 +-
src/video/windows/SDL_windowsclipboard.c | 6 +-
src/video/windows/SDL_windowskeyboard.c | 6 +-
src/video/windows/SDL_windowsopengl.c | 14 +-
src/video/windows/SDL_windowsopengles.c | 3 +-
src/video/windows/SDL_windowsshape.c | 3 +-
src/video/windows/SDL_windowsvideo.c | 9 +-
src/video/windows/SDL_windowswindow.c | 15 +-
src/video/winrt/SDL_winrtpointerinput.cpp | 3 +-
src/video/winrt/SDL_winrtvideo.cpp | 3 +-
src/video/x11/SDL_x11clipboard.c | 12 +-
src/video/x11/SDL_x11framebuffer.c | 3 +-
src/video/x11/SDL_x11keyboard.c | 6 +-
src/video/x11/SDL_x11modes.c | 3 +-
src/video/x11/SDL_x11opengl.c | 12 +-
src/video/x11/SDL_x11opengles.c | 8 +-
src/video/x11/SDL_x11shape.c | 3 +-
src/video/x11/SDL_x11video.c | 3 +-
src/video/x11/SDL_x11window.c | 21 +--
243 files changed, 1218 insertions(+), 2364 deletions(-)
diff --git a/src/SDL.c b/src/SDL.c
index 10cbeaaa0582..1be811151059 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -442,8 +442,7 @@ void SDL_QuitSubSystem(Uint32 flags)
#endif
}
-Uint32
-SDL_WasInit(Uint32 flags)
+Uint32 SDL_WasInit(Uint32 flags)
{
int i;
int num_subsystems = SDL_arraysize(SDL_SubsystemRefCount);
@@ -531,22 +530,19 @@ void SDL_GetVersion(SDL_version *ver)
}
/* Get the library source revision */
-const char *
-SDL_GetRevision(void)
+const char *SDL_GetRevision(void)
{
return SDL_REVISION;
}
/* Get the library source revision number */
-int
-SDL_GetRevisionNumber(void)
+int SDL_GetRevisionNumber(void)
{
return 0; /* doesn't make sense without Mercurial. */
}
/* Get the name of the platform */
-const char *
-SDL_GetPlatform(void)
+const char *SDL_GetPlatform(void)
{
#if __AIX__
return "AIX";
@@ -619,8 +615,7 @@ SDL_GetPlatform(void)
#endif
}
-SDL_bool
-SDL_IsTablet(void)
+SDL_bool SDL_IsTablet(void)
{
#if __ANDROID__
extern SDL_bool SDL_IsAndroidTablet(void);
@@ -638,9 +633,7 @@ SDL_IsTablet(void)
#if (!defined(HAVE_LIBC) || defined(__WATCOMC__)) && !defined(SDL_STATIC_LIB)
/* Need to include DllMain() on Watcom C for some reason.. */
-BOOL APIENTRY
-_DllMainCRTStartup(HANDLE hModule,
- DWORD ul_reason_for_call, LPVOID lpReserved)
+BOOL APIENTRY _DllMainCRTStartup(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
{
switch (ul_reason_for_call) {
case DLL_PROCESS_ATTACH:
diff --git a/src/SDL_assert.c b/src/SDL_assert.c
index 85a7090c461d..dc5a220ab1a5 100644
--- a/src/SDL_assert.c
+++ b/src/SDL_assert.c
@@ -326,9 +326,7 @@ static SDL_assert_state SDLCALL SDL_PromptAssertion(const SDL_assert_data *data,
return state;
}
-SDL_assert_state
-SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
- int line)
+SDL_assert_state SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file, int line)
{
SDL_assert_state state = SDL_ASSERTION_IGNORE;
static int assertion_running = 0;
diff --git a/src/SDL_dataqueue.c b/src/SDL_dataqueue.c
index 4f63fcad938c..2019c3083cc8 100644
--- a/src/SDL_dataqueue.c
+++ b/src/SDL_dataqueue.c
@@ -50,8 +50,7 @@ static void SDL_FreeDataQueueList(SDL_DataQueuePacket *packet)
}
}
-SDL_DataQueue *
-SDL_NewDataQueue(const size_t _packetlen, const size_t initialslack)
+SDL_DataQueue *SDL_NewDataQueue(const size_t _packetlen, const size_t initialslack)
{
SDL_DataQueue *queue = (SDL_DataQueue *)SDL_calloc(1, sizeof(SDL_DataQueue));
@@ -316,8 +315,7 @@ SDL_CountDataQueue(SDL_DataQueue *queue)
return retval;
}
-SDL_mutex *
-SDL_GetDataQueueMutex(SDL_DataQueue *queue)
+SDL_mutex *SDL_GetDataQueueMutex(SDL_DataQueue *queue)
{
return queue ? queue->lock : NULL;
}
diff --git a/src/SDL_error.c b/src/SDL_error.c
index 0c31aafc7c41..501d3958457d 100644
--- a/src/SDL_error.c
+++ b/src/SDL_error.c
@@ -61,8 +61,7 @@ int SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
}
/* Available for backwards compatibility */
-const char *
-SDL_GetError(void)
+const char *SDL_GetError(void)
{
const SDL_error *error = SDL_GetErrBuf();
return error->error ? error->str : "";
@@ -108,8 +107,7 @@ int main(int argc, char *argv[])
}
#endif
-char *
-SDL_GetErrorMsg(char *errstr, int maxlen)
+char *SDL_GetErrorMsg(char *errstr, int maxlen)
{
const SDL_error *error = SDL_GetErrBuf();
diff --git a/src/SDL_hints.c b/src/SDL_hints.c
index aeee736d6195..ceec0d5fb248 100644
--- a/src/SDL_hints.c
+++ b/src/SDL_hints.c
@@ -45,9 +45,7 @@ typedef struct SDL_Hint
static SDL_Hint *SDL_hints;
-SDL_bool
-SDL_SetHintWithPriority(const char *name, const char *value,
- SDL_HintPriority priority)
+SDL_bool SDL_SetHintWithPriority(const char *name, const char *value, SDL_HintPriority priority)
{
const char *env;
SDL_Hint *hint;
@@ -97,8 +95,7 @@ SDL_SetHintWithPriority(const char *name, const char *value,
return SDL_TRUE;
}
-SDL_bool
-SDL_ResetHint(const char *name)
+SDL_bool SDL_ResetHint(const char *name)
{
const char *env;
SDL_Hint *hint;
@@ -154,14 +151,12 @@ void SDL_ResetHints(void)
}
}
-SDL_bool
-SDL_SetHint(const char *name, const char *value)
+SDL_bool SDL_SetHint(const char *name, const char *value)
{
return SDL_SetHintWithPriority(name, value, SDL_HINT_NORMAL);
}
-const char *
-SDL_GetHint(const char *name)
+const char *SDL_GetHint(const char *name)
{
const char *env;
SDL_Hint *hint;
@@ -178,8 +173,7 @@ SDL_GetHint(const char *name)
return env;
}
-SDL_bool
-SDL_GetStringBoolean(const char *value, SDL_bool default_value)
+SDL_bool SDL_GetStringBoolean(const char *value, SDL_bool default_value)
{
if (value == NULL || !*value) {
return default_value;
@@ -190,8 +184,7 @@ SDL_GetStringBoolean(const char *value, SDL_bool default_value)
return SDL_TRUE;
}
-SDL_bool
-SDL_GetHintBoolean(const char *name, SDL_bool default_value)
+SDL_bool SDL_GetHintBoolean(const char *name, SDL_bool default_value)
{
const char *hint = SDL_GetHint(name);
return SDL_GetStringBoolean(hint, default_value);
diff --git a/src/SDL_log.c b/src/SDL_log.c
index 2dda72d5bde6..ab6e7c2cbcca 100644
--- a/src/SDL_log.c
+++ b/src/SDL_log.c
@@ -154,8 +154,7 @@ void SDL_LogSetPriority(int category, SDL_LogPriority priority)
}
}
-SDL_LogPriority
-SDL_LogGetPriority(int category)
+SDL_LogPriority SDL_LogGetPriority(int category)
{
SDL_LogLevel *entry;
diff --git a/src/atomic/SDL_atomic.c b/src/atomic/SDL_atomic.c
index 6a9a19bf5ff0..4e10d52db083 100644
--- a/src/atomic/SDL_atomic.c
+++ b/src/atomic/SDL_atomic.c
@@ -124,8 +124,7 @@ static SDL_INLINE void leaveLock(void *a)
}
#endif
-SDL_bool
-SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval)
+SDL_bool SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval)
{
#ifdef HAVE_MSC_ATOMICS
SDL_COMPILE_TIME_ASSERT(atomic_cas, sizeof(long) == sizeof(a->value));
@@ -154,8 +153,7 @@ SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval)
#endif
}
-SDL_bool
-SDL_AtomicCASPtr(void **a, void *oldval, void *newval)
+SDL_bool SDL_AtomicCASPtr(void **a, void *oldval, void *newval)
{
#if defined(HAVE_MSC_ATOMICS)
return _InterlockedCompareExchangePointer(a, newval, oldval) == oldval;
@@ -205,8 +203,7 @@ int SDL_AtomicSet(SDL_atomic_t *a, int v)
#endif
}
-void *
-SDL_AtomicSetPtr(void **a, void *v)
+void *SDL_AtomicSetPtr(void **a, void *v)
{
#if defined(HAVE_MSC_ATOMICS)
return _InterlockedExchangePointer(a, v);
@@ -272,8 +269,7 @@ int SDL_AtomicGet(SDL_atomic_t *a)
#endif
}
-void *
-SDL_AtomicGetPtr(void **a)
+void *SDL_AtomicGetPtr(void **a)
{
#ifdef HAVE_ATOMIC_LOAD_N
return __atomic_load_n(a, __ATOMIC_SEQ_CST);
diff --git a/src/atomic/SDL_spinlock.c b/src/atomic/SDL_spinlock.c
index 8905b67c8f37..9fd3e616769b 100644
--- a/src/atomic/SDL_spinlock.c
+++ b/src/atomic/SDL_spinlock.c
@@ -61,8 +61,7 @@ extern __inline int _SDL_xchg_watcom(volatile int *a, int v);
/* *INDENT-ON* */ /* clang-format on */
/* This function is where all the magic happens... */
-SDL_bool
-SDL_AtomicTryLock(SDL_SpinLock *lock)
+SDL_bool SDL_AtomicTryLock(SDL_SpinLock *lock)
{
#if SDL_ATOMIC_DISABLED
/* Terrible terrible damage */
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 0a34d4f7c0ed..60242e60a06d 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -603,8 +603,7 @@ int SDL_QueueAudio(SDL_AudioDeviceID devid, const void *data, Uint32 len)
return rc;
}
-Uint32
-SDL_DequeueAudio(SDL_AudioDeviceID devid, void *data, Uint32 len)
+Uint32 SDL_DequeueAudio(SDL_AudioDeviceID devid, void *data, Uint32 len)
{
SDL_AudioDevice *device = get_audio_device(devid);
Uint32 rc;
@@ -622,8 +621,7 @@ SDL_DequeueAudio(SDL_AudioDeviceID devid, void *data, Uint32 len)
return rc;
}
-Uint32
-SDL_GetQueuedAudioSize(SDL_AudioDeviceID devid)
+Uint32 SDL_GetQueuedAudioSize(SDL_AudioDeviceID devid)
{
Uint32 retval = 0;
SDL_AudioDevice *device = get_audio_device(devid);
@@ -904,8 +902,7 @@ int SDL_GetNumAudioDrivers(void)
return SDL_arraysize(bootstrap) - 1;
}
-const char *
-SDL_GetAudioDriver(int index)
+const char *SDL_GetAudioDriver(int index)
{
if (index >= 0 && index < SDL_GetNumAudioDrivers()) {
return bootstrap[index]->name;
@@ -1012,8 +1009,7 @@ int SDL_AudioInit(const char *driver_name)
/*
* Get the current audio driver name
*/
-const char *
-SDL_GetCurrentAudioDriver()
+const char *SDL_GetCurrentAudioDriver()
{
return current_audio.name;
}
@@ -1073,8 +1069,7 @@ int SDL_GetNumAudioDevices(int iscapture)
return retval;
}
-const char *
-SDL_GetAudioDeviceName(int index, int iscapture)
+const char *SDL_GetAudioDeviceName(int index, int iscapture)
{
SDL_AudioDeviceItem *item;
int i;
@@ -1191,8 +1186,7 @@ static void close_audio_device(SDL_AudioDevice *device)
SDL_free(device);
}
-static Uint16
-GetDefaultSamplesFromFreq(int freq)
+static Uint16 GetDefaultSamplesFromFreq(int freq)
{
/* Pick a default of ~46 ms at desired frequency */
/* !!! FIXME: remove this when the non-Po2 resampling is in. */
@@ -1560,8 +1554,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained)
return (id == 0) ? -1 : 0;
}
-SDL_AudioDeviceID
-SDL_OpenAudioDevice(const char *device, int iscapture,
+SDL_AudioDeviceID SDL_OpenAudioDevice(const char *device, int iscapture,
const SDL_AudioSpec *desired, SDL_AudioSpec *obtained,
int allowed_changes)
{
@@ -1569,8 +1562,7 @@ SDL_OpenAudioDevice(const char *device, int iscapture,
allowed_changes, 2);
}
-SDL_AudioStatus
-SDL_GetAudioDeviceStatus(SDL_AudioDeviceID devid)
+SDL_AudioStatus SDL_GetAudioDeviceStatus(SDL_AudioDeviceID devid)
{
SDL_AudioDevice *device = get_audio_device(devid);
SDL_AudioStatus status = SDL_AUDIO_STOPPED;
@@ -1584,8 +1576,7 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID devid)
return status;
}
-SDL_AudioStatus
-SDL_GetAudioStatus(void)
+SDL_AudioStatus SDL_GetAudioStatus(void)
{
return SDL_GetAudioDeviceStatus(1);
}
@@ -1697,8 +1688,7 @@ static SDL_AudioFormat format_list[NUM_FORMATS][NUM_FORMATS] = {
AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8 },
};
-SDL_AudioFormat
-SDL_FirstAudioFormat(SDL_AudioFormat format)
+SDL_AudioFormat SDL_FirstAudioFormat(SDL_AudioFormat format)
{
for (format_idx = 0; format_idx < NUM_FORMATS; ++format_idx) {
if (format_list[format_idx][0] == format) {
@@ -1709,8 +1699,7 @@ SDL_FirstAudioFormat(SDL_AudioFormat format)
return SDL_NextAudioFormat();
}
-SDL_AudioFormat
-SDL_NextAudioFormat(void)
+SDL_AudioFormat SDL_NextAudioFormat(void)
{
if ((format_idx == NUM_FORMATS) || (format_idx_sub == NUM_FORMATS)) {
return 0;
diff --git a/src/audio/SDL_audiocvt.c b/src/audio/SDL_audiocvt.c
index 01f3a5575676..ed4333eca12f 100644
--- a/src/audio/SDL_audiocvt.c
+++ b/src/audio/SDL_audiocvt.c
@@ -1005,8 +1005,7 @@ static void SDL_CleanupAudioStreamResampler(SDL_AudioStream *stream)
SDL_free(stream->resampler_state);
}
-SDL_AudioStream *
-SDL_NewAudioStream(const SDL_AudioFormat src_format,
+SDL_AudioStream *SDL_NewAudioStream(const SDL_AudioFormat src_format,
const Uint8 src_channels,
const int src_rate,
const SDL_AudioFormat dst_format,
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
index 6959c56fcb63..209a577c0737 100644
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@@ -2077,8 +2077,7 @@ static int WaveLoad(SDL_RWops *src, WaveFile *file, SDL_AudioSpec *spec, Uint8 *
return 0;
}
-SDL_AudioSpec *
-SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len)
+SDL_AudioSpec *SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len)
{
int result;
WaveFile file;
diff --git a/src/audio/arts/SDL_artsaudio.c b/src/audio/arts/SDL_artsaudio.c
index 38e11904ae5b..ea4f3119b53a 100644
--- a/src/audio/arts/SDL_artsaudio.c
+++ b/src/audio/arts/SDL_artsaudio.c
@@ -86,8 +86,7 @@ static struct
#undef SDL_ARTS_SYM
-static void
-UnloadARTSLibrary()
+static void UnloadARTSLibrary()
{
if (arts_handle != NULL) {
SDL_UnloadObject(arts_handle);
@@ -95,8 +94,7 @@ UnloadARTSLibrary()
}
}
-static int
-LoadARTSLibrary(void)
+static int LoadARTSLibrary(void)
{
int i, retval = -1;
@@ -121,14 +119,12 @@ LoadARTSLibrary(void)
#else
-static void
-UnloadARTSLibrary()
+static void UnloadARTSLibrary()
{
return;
}
-static int
-LoadARTSLibrary(void)
+static int LoadARTSLibrary(void)
{
return 0;
}
@@ -136,8 +132,7 @@ LoadARTSLibrary(void)
#endif /* SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
/* This function waits until it is possible to write a full sound buffer */
-static void
-ARTS_WaitDevice(_THIS)
+static void ARTS_WaitDevice(_THIS)
{
Sint32 ticks;
@@ -163,8 +158,7 @@ ARTS_WaitDevice(_THIS)
}
}
-static void
-ARTS_PlayDevice(_THIS)
+static void ARTS_PlayDevice(_THIS)
{
/* Write the audio data */
int written = SDL_NAME(arts_write) (this->hidden->stream,
@@ -185,15 +179,13 @@ ARTS_PlayDevice(_THIS)
#endif
}
-static Uint8 *
-ARTS_GetDeviceBuf(_THIS)
+static Uint8 *ARTS_GetDeviceBuf(_THIS)
{
return (this->hidden->mixbuf);
}
-static void
-ARTS_CloseDevice(_THIS)
+static void ARTS_CloseDevice(_THIS)
{
if (this->hidden->stream) {
SDL_NAME(arts_close_stream) (this->hidden->stream);
@@ -203,8 +195,7 @@ ARTS_CloseDevice(_THIS)
SDL_free(this->hidden);
}
-static int
-ARTS_Suspend(void)
+static int ARTS_Suspend(void)
{
const Uint32 abortms = SDL_GetTicks() + 3000; /* give up after 3 secs */
while ( (!SDL_NAME(arts_suspended)()) && !SDL_TICKS_PASSED(SDL_GetTicks(), abortms) ) {
@@ -215,8 +206,7 @@ ARTS_Suspend(void)
return SDL_NAME(arts_suspended)();
}
-static int
-ARTS_OpenDevice(_THIS, const char *devname)
+static int ARTS_OpenDevice(_THIS, const char *devname)
{
int rc = 0;
int bits, frag_spec = 0;
@@ -304,15 +294,13 @@ ARTS_OpenDevice(_THIS, const char *devname)
}
-static void
-ARTS_Deinitialize(void)
+static void ARTS_Deinitialize(void)
{
UnloadARTSLibrary();
}
-static SDL_bool
-ARTS_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool ARTS_Init(SDL_AudioDriverImpl * impl)
{
if (LoadARTSLibrary() < 0) {
return SDL_FALSE;
diff --git a/src/audio/esd/SDL_esdaudio.c b/src/audio/esd/SDL_esdaudio.c
index 0f49b09d6189..800caaf0b807 100644
--- a/src/audio/esd/SDL_esdaudio.c
+++ b/src/audio/esd/SDL_esdaudio.c
@@ -64,8 +64,7 @@ static struct
#undef SDL_ESD_SYM
-static void
-UnloadESDLibrary()
+static void UnloadESDLibrary()
{
if (esd_handle != NULL) {
SDL_UnloadObject(esd_handle);
@@ -73,8 +72,7 @@ UnloadESDLibrary()
}
}
-static int
-LoadESDLibrary(void)
+static int LoadESDLibrary(void)
{
int i, retval = -1;
@@ -98,14 +96,12 @@ LoadESDLibrary(void)
#else
-static void
-UnloadESDLibrary()
+static void UnloadESDLibrary()
{
return;
}
-static int
-LoadESDLibrary(void)
+static int LoadESDLibrary(void)
{
return 0;
}
@@ -114,8 +110,7 @@ LoadESDLibrary(void)
/* This function waits until it is possible to write a full sound buffer */
-static void
-ESD_WaitDevice(_THIS)
+static void ESD_WaitDevice(_THIS)
{
Sint32 ticks;
@@ -140,8 +135,7 @@ ESD_WaitDevice(_THIS)
}
}
-static void
-ESD_PlayDevice(_THIS)
+static void ESD_PlayDevice(_THIS)
{
int written = 0;
@@ -164,14 +158,12 @@ ESD_PlayDevice(_THIS)
}
}
-static Uint8 *
-ESD_GetDeviceBuf(_THIS)
+static Uint8 *ESD_GetDeviceBuf(_THIS)
{
return (this->hidden->mixbuf);
}
-static void
-ESD_CloseDevice(_THIS)
+static void ESD_CloseDevice(_THIS)
{
if (this->hidden->audio_fd >= 0) {
SDL_NAME(esd_close) (this->hidden->audio_fd);
@@ -181,8 +173,7 @@ ESD_CloseDevice(_THIS)
}
/* Try to get the name of the program */
-static char *
-get_progname(void)
+static char *get_progname(void)
{
char *progname = NULL;
#ifdef __LINUX__
@@ -207,8 +198,7 @@ get_progname(void)
}
-static int
-ESD_OpenDevice(_THIS, const char *devname)
+static int ESD_OpenDevice(_THIS, const char *devname)
{
esd_format_t format = (ESD_STREAM | ESD_PLAY);
SDL_AudioFormat test_format = 0;
@@ -286,14 +276,12 @@ ESD_OpenDevice(_THIS, const char *devname)
return 0;
}
-static void
-ESD_Deinitialize(void)
+static void ESD_Deinitialize(void)
{
UnloadESDLibrary();
}
-static SDL_bool
-ESD_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool ESD_Init(SDL_AudioDriverImpl * impl)
{
if (LoadESDLibrary() < 0) {
return SDL_FALSE;
diff --git a/src/audio/fusionsound/SDL_fsaudio.c b/src/audio/fusionsound/SDL_fsaudio.c
index dccf1f864c62..f79ab22f70c4 100644
--- a/src/audio/fusionsound/SDL_fsaudio.c
+++ b/src/audio/fusionsound/SDL_fsaudio.c
@@ -77,8 +77,7 @@ static struct
#undef SDL_FS_SYM
-static void
-UnloadFusionSoundLibrary()
+static void UnloadFusionSoundLibrary()
{
if (fs_handle != NULL) {
SDL_UnloadObject(fs_handle);
@@ -86,8 +85,7 @@ UnloadFusionSoundLibrary()
}
}
-static int
-LoadFusionSoundLibrary(void)
+static int LoadFusionSoundLibrary(void)
{
int i, retval = -1;
@@ -112,14 +110,12 @@ LoadFusionSoundLibrary(void)
#else
-static void
-UnloadFusionSoundLibrary()
+static void UnloadFusionSoundLibrary()
{
(Patch may be truncated, please check the link at the top of this post.)