From ddbdd732589aff165c2dca3d77d54a6da2404be3 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 23 May 2023 11:29:41 -0700
Subject: [PATCH] Updated source to match SDL function prototype style
---
src/SDL.c | 13 +-
src/SDL_assert.c | 4 +-
src/SDL_dataqueue.c | 15 +--
src/SDL_error.c | 6 +-
src/SDL_hints.c | 19 +--
src/SDL_log.c | 3 +-
src/atomic/SDL_atomic.c | 6 +-
src/atomic/SDL_spinlock.c | 3 +-
src/audio/SDL_audio.c | 15 +--
src/audio/SDL_audiocvt.c | 3 +-
src/audio/SDL_wave.c | 3 +-
src/audio/pipewire/SDL_pipewire.c | 2 +-
src/audio/qnx/SDL_qsa_audio.c | 33 ++----
src/core/freebsd/SDL_evdev_kbd_freebsd.c | 3 +-
src/core/haiku/SDL_BeApp.cc | 9 +-
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 | 6 +-
src/core/linux/SDL_ime.c | 6 +-
src/core/linux/SDL_system_theme.c | 14 +--
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 | 45 +++----
src/events/SDL_keyboard.c | 33 ++----
src/events/SDL_keysym_to_scancode.c | 3 +-
src/events/SDL_mouse.c | 28 ++---
src/events/SDL_touch.c | 15 +--
src/file/SDL_rwops.c | 33 ++----
src/file/n3ds/SDL_rwopsromfs.c | 23 ++--
src/filesystem/android/SDL_sysfilesystem.c | 6 +-
src/filesystem/cocoa/SDL_sysfilesystem.m | 6 +-
src/filesystem/emscripten/SDL_sysfilesystem.c | 6 +-
src/filesystem/haiku/SDL_sysfilesystem.cc | 6 +-
src/filesystem/n3ds/SDL_sysfilesystem.c | 16 +--
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 | 28 ++---
src/filesystem/vita/SDL_sysfilesystem.c | 6 +-
src/filesystem/windows/SDL_sysfilesystem.c | 9 +-
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 | 21 ++--
src/hidapi/windows/hid.c | 3 +-
src/joystick/apple/SDL_mfijoystick.m | 6 +-
src/joystick/darwin/SDL_iokitjoystick.c | 6 +-
src/joystick/hidapi/SDL_hidapi_switch.c | 3 +-
src/joystick/hidapi/SDL_hidapijoystick.c | 6 +-
src/joystick/windows/SDL_dinputjoystick.c | 6 +-
src/joystick/windows/SDL_rawinputjoystick.c | 9 +-
src/locale/SDL_locale.c | 3 +-
src/locale/haiku/SDL_syslocale.cc | 3 +-
src/locale/n3ds/SDL_syslocale.c | 5 +-
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/macos/SDL_syspower.c | 3 +-
src/power/n3ds/SDL_syspower.c | 18 ++-
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/render/SDL_yuv_sw.c | 3 +-
src/render/direct3d/SDL_render_d3d.c | 6 +-
src/render/direct3d11/SDL_render_d3d11.c | 6 +-
src/render/direct3d12/SDL_render_d3d12.c | 3 +-
src/render/metal/SDL_render_metal.m | 6 +-
src/render/opengl/SDL_render_gl.c | 12 +-
src/render/opengl/SDL_shaders_gl.c | 3 +-
src/render/opengles2/SDL_render_gles2.c | 9 +-
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_tools.c | 3 +-
src/sensor/n3ds/SDL_n3dssensor.c | 18 ++-
src/stdlib/SDL_getenv.c | 9 +-
src/stdlib/SDL_iconv.c | 16 +--
src/stdlib/SDL_qsort.c | 3 +-
src/stdlib/SDL_string.c | 111 ++++++------------
src/test/SDL_test_common.c | 12 +-
src/test/SDL_test_fuzzer.c | 9 +-
src/test/SDL_test_harness.c | 3 +-
src/test/SDL_test_log.c | 6 +-
src/thread/SDL_thread.c | 30 ++---
src/thread/generic/SDL_syscond.c | 3 +-
src/thread/generic/SDL_sysmutex.c | 3 +-
src/thread/generic/SDL_syssem.c | 6 +-
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 | 3 +-
src/thread/ngage/SDL_systhread.cpp | 3 +-
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_sysrwlock.c | 3 +-
src/thread/pthread/SDL_syssem.c | 3 +-
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 | 3 +-
src/thread/windows/SDL_systhread.c | 3 +-
src/thread/windows/SDL_systls.c | 3 +-
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 | 18 +--
src/video/SDL_egl.c | 6 +-
src/video/SDL_pixels.c | 17 +--
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 | 27 ++---
src/video/android/SDL_androidclipboard.c | 3 +-
src/video/android/SDL_androidgl.c | 3 +-
src/video/android/SDL_androidkeyboard.c | 6 +-
src/video/cocoa/SDL_cocoaclipboard.m | 6 +-
src/video/cocoa/SDL_cocoaopengles.m | 6 +-
src/video/cocoa/SDL_cocoashape.m | 3 +-
src/video/cocoa/SDL_cocoawindow.m | 6 +-
src/video/haiku/SDL_bmessagebox.cc | 3 +-
src/video/kmsdrm/SDL_kmsdrmvideo.c | 6 +-
src/video/n3ds/SDL_n3dsframebuffer.c | 30 ++---
src/video/n3ds/SDL_n3dsswkb.c | 3 +-
src/video/n3ds/SDL_n3dsvideo.c | 2 +-
src/video/offscreen/SDL_offscreenopengles.c | 3 +-
src/video/qnx/SDL_qnxgl.c | 30 ++---
src/video/qnx/SDL_qnxkeyboard.c | 3 +-
src/video/qnx/SDL_qnxvideo.c | 36 ++----
src/video/riscos/SDL_riscosmodes.c | 3 +-
src/video/uikit/SDL_uikitclipboard.m | 6 +-
src/video/uikit/SDL_uikitmessagebox.m | 3 +-
src/video/uikit/SDL_uikitmodes.m | 3 +-
src/video/uikit/SDL_uikitviewcontroller.m | 6 +-
src/video/vita/SDL_vitagl_pvr.c | 6 +-
src/video/vita/SDL_vitagles_pvr.c | 3 +-
src/video/wayland/SDL_waylanddatamanager.c | 11 +-
src/video/wayland/SDL_waylandevents.c | 6 +-
src/video/wayland/SDL_waylandmouse.c | 3 +-
src/video/wayland/SDL_waylandwindow.c | 2 +-
src/video/windows/SDL_windowsclipboard.c | 6 +-
src/video/windows/SDL_windowskeyboard.c | 6 +-
src/video/windows/SDL_windowsopengles.c | 3 +-
src/video/windows/SDL_windowsshape.c | 3 +-
src/video/windows/SDL_windowsvideo.c | 3 +-
src/video/winrt/SDL_winrtpointerinput.cpp | 3 +-
src/video/x11/SDL_x11clipboard.c | 15 +--
src/video/x11/SDL_x11framebuffer.c | 3 +-
src/video/x11/SDL_x11keyboard.c | 6 +-
src/video/x11/SDL_x11opengles.c | 9 +-
src/video/x11/SDL_x11shape.c | 3 +-
src/video/x11/SDL_x11video.c | 3 +-
src/video/x11/SDL_x11window.c | 9 +-
173 files changed, 481 insertions(+), 942 deletions(-)
diff --git a/src/SDL.c b/src/SDL.c
index e1daed6be765..2d1260fdc9f4 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -537,15 +537,13 @@ int 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 name of the platform */
-const char *
-SDL_GetPlatform(void)
+const char *SDL_GetPlatform(void)
{
#ifdef __AIX__
return "AIX";
@@ -616,8 +614,7 @@ SDL_GetPlatform(void)
#endif
}
-SDL_bool
-SDL_IsTablet(void)
+SDL_bool SDL_IsTablet(void)
{
#ifdef __ANDROID__
extern SDL_bool SDL_IsAndroidTablet(void);
@@ -635,9 +632,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 8cca6d6ac999..50ac16572275 100644
--- a/src/SDL_assert.c
+++ b/src/SDL_assert.c
@@ -318,9 +318,7 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
return state;
}
-SDL_AssertState
-SDL_ReportAssertion(SDL_AssertData *data, const char *func, const char *file,
- int line)
+SDL_AssertState SDL_ReportAssertion(SDL_AssertData *data, const char *func, const char *file, int line)
{
SDL_AssertState state = SDL_ASSERTION_IGNORE;
static int assertion_running = 0;
diff --git a/src/SDL_dataqueue.c b/src/SDL_dataqueue.c
index f73ee0e9a197..4b3b79c9419c 100644
--- a/src/SDL_dataqueue.c
+++ b/src/SDL_dataqueue.c
@@ -49,8 +49,7 @@ static void SDL_FreeDataQueueList(SDL_DataQueuePacket *packet)
}
}
-SDL_DataQueue *
-SDL_CreateDataQueue(const size_t _packetlen, const size_t initialslack)
+SDL_DataQueue *SDL_CreateDataQueue(const size_t _packetlen, const size_t initialslack)
{
SDL_DataQueue *queue = (SDL_DataQueue *)SDL_calloc(1, sizeof(SDL_DataQueue));
@@ -230,8 +229,7 @@ int SDL_WriteToDataQueue(SDL_DataQueue *queue, const void *_data, const size_t _
return 0;
}
-size_t
-SDL_PeekIntoDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
+size_t SDL_PeekIntoDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
{
size_t len = _len;
Uint8 *buf = (Uint8 *)_buf;
@@ -259,8 +257,7 @@ SDL_PeekIntoDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
return (size_t)(ptr - buf);
}
-size_t
-SDL_ReadFromDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
+size_t SDL_ReadFromDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
{
size_t len = _len;
Uint8 *buf = (Uint8 *)_buf;
@@ -303,8 +300,7 @@ SDL_ReadFromDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
return (size_t)(ptr - buf);
}
-size_t
-SDL_GetDataQueueSize(SDL_DataQueue *queue)
+size_t SDL_GetDataQueueSize(SDL_DataQueue *queue)
{
size_t retval = 0;
if (queue) {
@@ -315,8 +311,7 @@ SDL_GetDataQueueSize(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 238c50f77532..00f1bcf7d944 100644
--- a/src/SDL_error.c
+++ b/src/SDL_error.c
@@ -60,8 +60,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 : "";
@@ -91,8 +90,7 @@ int SDL_Error(SDL_errorcode code)
}
}
-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 85eda0a68c70..42e61ccf7ea4 100644
--- a/src/SDL_hints.c
+++ b/src/SDL_hints.c
@@ -43,9 +43,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;
@@ -95,8 +93,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;
@@ -152,14 +149,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;
@@ -176,8 +171,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;
@@ -188,8 +182,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 25eb60b62dd9..214574e34d5f 100644
--- a/src/SDL_log.c
+++ b/src/SDL_log.c
@@ -160,8 +160,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 3e57a48cfbc3..6b1b0f4c6236 100644
--- a/src/atomic/SDL_atomic.c
+++ b/src/atomic/SDL_atomic.c
@@ -122,8 +122,7 @@ static SDL_INLINE void leaveLock(void *a)
}
#endif
-SDL_bool
-SDL_AtomicCAS(SDL_AtomicInt *a, int oldval, int newval)
+SDL_bool SDL_AtomicCAS(SDL_AtomicInt *a, int oldval, int newval)
{
#ifdef HAVE_MSC_ATOMICS
SDL_COMPILE_TIME_ASSERT(atomic_cas, sizeof(long) == sizeof(a->value));
@@ -152,8 +151,7 @@ SDL_AtomicCAS(SDL_AtomicInt *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)
{
#ifdef HAVE_MSC_ATOMICS
return _InterlockedCompareExchangePointer(a, newval, oldval) == oldval;
diff --git a/src/atomic/SDL_spinlock.c b/src/atomic/SDL_spinlock.c
index f9d436816873..d4eaff41c602 100644
--- a/src/atomic/SDL_spinlock.c
+++ b/src/atomic/SDL_spinlock.c
@@ -57,8 +57,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)
{
#ifdef SDL_ATOMIC_DISABLED
/* Terrible terrible damage */
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 99c26d406369..09abb24cf918 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -789,8 +789,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;
@@ -893,8 +892,7 @@ int SDL_InitAudio(const char *driver_name)
/*
* Get the current audio driver name
*/
-const char *
-SDL_GetCurrentAudioDriver(void)
+const char *SDL_GetCurrentAudioDriver(void)
{
return current_audio.name;
}
@@ -954,8 +952,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;
@@ -1412,8 +1409,7 @@ static SDL_AudioDeviceID open_audio_device(const char *devname, int iscapture,
return device->id;
}
-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)
{
@@ -1421,8 +1417,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;
diff --git a/src/audio/SDL_audiocvt.c b/src/audio/SDL_audiocvt.c
index e66d31350eaa..8c3badcb487e 100644
--- a/src/audio/SDL_audiocvt.c
+++ b/src/audio/SDL_audiocvt.c
@@ -602,8 +602,7 @@ static int SetAudioStreamFormat(SDL_AudioStream *stream, SDL_AudioFormat src_for
return 0;
}
-SDL_AudioStream *
-SDL_CreateAudioStream(SDL_AudioFormat src_format,
+SDL_AudioStream *SDL_CreateAudioStream(SDL_AudioFormat src_format,
int src_channels,
int src_rate,
SDL_AudioFormat dst_format,
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
index fb5e91ff4e9b..d7e6ac3c36a4 100644
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@@ -2075,8 +2075,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/pipewire/SDL_pipewire.c b/src/audio/pipewire/SDL_pipewire.c
index 98b5d7b5b28d..af6ffde02d8d 100644
--- a/src/audio/pipewire/SDL_pipewire.c
+++ b/src/audio/pipewire/SDL_pipewire.c
@@ -202,7 +202,7 @@ static int load_pipewire_syms(void)
return 0;
}
-SDL_FORCE_INLINE SDL_bool pipewire_version_at_least(int major, int minor, int patch)
+static SDL_bool pipewire_version_at_least(int major, int minor, int patch)
{
return (pipewire_version_major >= major) &&
(pipewire_version_major > major || pipewire_version_minor >= minor) &&
diff --git a/src/audio/qnx/SDL_qsa_audio.c b/src/audio/qnx/SDL_qsa_audio.c
index 63b9db5a373e..11ec7b441c34 100644
--- a/src/audio/qnx/SDL_qsa_audio.c
+++ b/src/audio/qnx/SDL_qsa_audio.c
@@ -73,15 +73,13 @@ uint32_t qsa_playback_devices;
QSA_Device qsa_capture_device[QSA_MAX_DEVICES];
uint32_t qsa_capture_devices;
-static SDL_INLINE int
-QSA_SetError(const char *fn, int status)
+static int QSA_SetError(const char *fn, int status)
{
return SDL_SetError("QSA: %s() failed: %s", fn, snd_strerror(status));
}
/* !!! FIXME: does this need to be here? Does the SDL version not work? */
-static void
-QSA_ThreadInit(SDL_AudioDevice *_this)
+static void QSA_ThreadInit(SDL_AudioDevice *_this)
{
/* Increase default 10 priority to 25 to avoid jerky sound */
struct sched_param param;
@@ -92,8 +90,7 @@ QSA_ThreadInit(SDL_AudioDevice *_this)
}
/* PCM channel parameters initialize function */
-static void
-QSA_InitAudioParams(snd_pcm_channel_params_t * cpars)
+static void QSA_InitAudioParams(snd_pcm_channel_params_t * cpars)
{
SDL_zerop(cpars);
cpars->channel = SND_PCM_CHANNEL_PLAYBACK;
@@ -110,8 +107,7 @@ QSA_InitAudioParams(snd_pcm_channel_params_t * cpars)
}
/* This function waits until it is possible to write a full sound buffer */
-static void
-QSA_WaitDevice(SDL_AudioDevice *_this)
+static void QSA_WaitDevice(SDL_AudioDevice *_this)
{
int result;
@@ -136,8 +132,7 @@ QSA_WaitDevice(SDL_AudioDevice *_this)
}
}
-static void
-QSA_PlayDevice(SDL_AudioDevice *_this)
+static void QSA_PlayDevice(SDL_AudioDevice *_this)
{
snd_pcm_channel_status_t cstatus;
int written;
@@ -229,14 +224,12 @@ QSA_PlayDevice(SDL_AudioDevice *_this)
}
}
-static Uint8 *
-QSA_GetDeviceBuf(SDL_AudioDevice *_this)
+static Uint8 *QSA_GetDeviceBuf(SDL_AudioDevice *_this)
{
return _this->hidden->pcm_buf;
}
-static void
-QSA_CloseDevice(SDL_AudioDevice *_this)
+static void QSA_CloseDevice(SDL_AudioDevice *_this)
{
if (_this->hidden->audio_handle != NULL) {
#if _NTO_VERSION < 710
@@ -257,8 +250,7 @@ QSA_CloseDevice(SDL_AudioDevice *_this)
SDL_free(_this->hidden);
}
-static int
-QSA_OpenDevice(SDL_AudioDevice *_this, const char *devname)
+static int QSA_OpenDevice(SDL_AudioDevice *_this, const char *devname)
{
#if 0
/* !!! FIXME: SDL2 used to pass this handle. What's the alternative? */
@@ -426,8 +418,7 @@ QSA_OpenDevice(SDL_AudioDevice *_this, const char *devname)
return 0;
}
-static void
-QSA_DetectDevices(void)
+static void QSA_DetectDevices(void)
{
uint32_t it;
uint32_t cards;
@@ -572,8 +563,7 @@ QSA_DetectDevices(void)
}
}
-static void
-QSA_Deinitialize(void)
+static void QSA_Deinitialize(void)
{
/* Clear devices array on shutdown */
/* !!! FIXME: we zero these on init...any reason to do it here? */
@@ -583,8 +573,7 @@ QSA_Deinitialize(void)
qsa_capture_devices = 0;
}
-static SDL_bool
-QSA_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool QSA_Init(SDL_AudioDriverImpl * impl)
{
/* Clear devices array */
SDL_zeroa(qsa_playback_device);
diff --git a/src/core/freebsd/SDL_evdev_kbd_freebsd.c b/src/core/freebsd/SDL_evdev_kbd_freebsd.c
index b641ee249b0b..fb71cc0868a3 100644
--- a/src/core/freebsd/SDL_evdev_kbd_freebsd.c
+++ b/src/core/freebsd/SDL_evdev_kbd_freebsd.c
@@ -220,8 +220,7 @@ static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state *kbd)
}
}
-SDL_EVDEV_keyboard_state *
-SDL_EVDEV_kbd_init(void)
+SDL_EVDEV_keyboard_state *SDL_EVDEV_kbd_init(void)
{
SDL_EVDEV_keyboard_state *kbd;
struct mouse_info mData;
diff --git a/src/core/haiku/SDL_BeApp.cc b/src/core/haiku/SDL_BeApp.cc
index 0dff28ffd64a..16eb58aff485 100644
--- a/src/core/haiku/SDL_BeApp.cc
+++ b/src/core/haiku/SDL_BeApp.cc
@@ -104,8 +104,7 @@ static int StartBeApp(void *unused)
}
-static int
-StartBeLooper()
+static int StartBeLooper()
{
if (!be_app) {
SDL_AppThread = SDL_CreateThreadInternal(StartBeApp, "SDLApplication", 0, NULL);
@@ -140,8 +139,7 @@ StartBeLooper()
/* Initialize the Be Application, if it's not already started */
-int
-SDL_InitBeApp(void)
+int SDL_InitBeApp(void)
{
/* Create the BApplication that handles appserver interaction */
if (SDL_BeAppActive <= 0) {
@@ -159,8 +157,7 @@ SDL_InitBeApp(void)
}
/* Quit the Be Application, if there's nothing left to do */
-void
-SDL_QuitBeApp(void)
+void SDL_QuitBeApp(void)
{
/* Decrement the application reference count */
--SDL_BeAppActive;
diff --git a/src/core/linux/SDL_dbus.c b/src/core/linux/SDL_dbus.c
index 81cbd290d70e..970af56b08a4 100644
--- a/src/core/linux/SDL_dbus.c
+++ b/src/core/linux/SDL_dbus.c
@@ -190,8 +190,7 @@ void SDL_DBus_Quit(void)
inhibit_handle = NULL;
}
-SDL_DBusContext *
-SDL_DBus_GetContext(void)
+SDL_DBusContext *SDL_DBus_GetContext(void)
{
if (dbus_handle == NULL || !dbus.session_conn) {
SDL_DBus_Init();
@@ -243,8 +242,7 @@ static SDL_bool SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *no
return retval;
}
-SDL_bool
-SDL_DBus_CallMethodOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, ...)
+SDL_bool SDL_DBus_CallMethodOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, ...)
{
SDL_bool retval;
va_list ap;
@@ -254,8 +252,7 @@ SDL_DBus_CallMethodOnConnection(DBusConnection *conn, const char *node, const ch
return retval;
}
-SDL_bool
-SDL_DBus_CallMethod(const char *node, const char *path, const char *interface, const char *method, ...)
+SDL_bool SDL_DBus_CallMethod(const char *node, const char *path, const char *interface, const char *method, ...)
{
SDL_bool retval;
va_list ap;
@@ -312,8 +309,7 @@ static SDL_bool SDL_DBus_CallWithBasicReply(DBusConnection *conn, DBusMessage *m
return retval;
}
-SDL_bool
-SDL_DBus_CallVoidMethodOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, ...)
+SDL_bool SDL_DBus_CallVoidMethodOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, ...)
{
SDL_bool retval;
va_list ap;
@@ -323,8 +319,7 @@ SDL_DBus_CallVoidMethodOnConnection(DBusConnection *conn, const char *node, cons
return retval;
}
-SDL_bool
-SDL_DBus_CallVoidMethod(const char *node, const char *path, const char *interface, const char *method, ...)
+SDL_bool SDL_DBus_CallVoidMethod(const char *node, const char *path, const char *interface, const char *method, ...)
{
SDL_bool retval;
va_list ap;
@@ -334,8 +329,7 @@ SDL_DBus_CallVoidMethod(const char *node, const char *path, const char *interfac
return retval;
}
-SDL_bool
-SDL_DBus_QueryPropertyOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *property, const int expectedtype, void *result)
+SDL_bool SDL_DBus_QueryPropertyOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *property, const int expectedtype, void *result)
{
SDL_bool retval = SDL_FALSE;
@@ -352,8 +346,7 @@ SDL_DBus_QueryPropertyOnConnection(DBusConnection *conn, const char *node, const
return retval;
}
-SDL_bool
-SDL_DBus_QueryProperty(const char *node, const char *path, const char *interface, const char *property, const int expectedtype, void *result)
+SDL_bool SDL_DBus_QueryProperty(const char *node, const char *path, const char *interface, const char *property, const int expectedtype, void *result)
{
return SDL_DBus_QueryPropertyOnConnection(dbus.session_conn, node, path, interface, property, expectedtype, result);
}
@@ -404,8 +397,7 @@ static SDL_bool SDL_DBus_AppendDictWithKeyValue(DBusMessageIter *iterInit, const
return SDL_FALSE;
}
-SDL_bool
-SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
+SDL_bool SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
{
const char *default_inhibit_reason = "Playing a game";
diff --git a/src/core/linux/SDL_evdev_kbd.c b/src/core/linux/SDL_evdev_kbd.c
index 026609b460b5..d82e0854080f 100644
--- a/src/core/linux/SDL_evdev_kbd.c
+++ b/src/core/linux/SDL_evdev_kbd.c
@@ -295,8 +295,7 @@ static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state *kbd)
}
}
-SDL_EVDEV_keyboard_state *
-SDL_EVDEV_kbd_init(void)
+SDL_EVDEV_keyboard_state *SDL_EVDEV_kbd_init(void)
{
SDL_EVDEV_keyboard_state *kbd;
char flag_state;
@@ -804,8 +803,7 @@ void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int keycode
#elif !defined(SDL_INPUT_FBSDKBIO) /* !SDL_INPUT_LINUXKD */
-SDL_EVDEV_keyboard_state *
-SDL_EVDEV_kbd_init(void)
+SDL_EVDEV_keyboard_state *SDL_EVDEV_kbd_init(void)
{
return NULL;
}
diff --git a/src/core/linux/SDL_fcitx.c b/src/core/linux/SDL_fcitx.c
index 43e09d722f1a..54addf582921 100644
--- a/src/core/linux/SDL_fcitx.c
+++ b/src/core/linux/SDL_fcitx.c
@@ -81,8 +81,7 @@ static char *GetAppName(void)
return SDL_strdup("SDL_App");
}
-static size_t
-Fcitx_GetPreeditString(SDL_DBusContext *dbus,
+static size_t Fcitx_GetPreeditString(SDL_DBusContext *dbus,
DBusMessage *msg,
char **ret,
Sint32 *start_pos,
@@ -367,8 +366,7 @@ static Uint32 Fcitx_ModState(void)
return fcitx_mods;
}
-SDL_bool
-SDL_Fcitx_Init(void)
+SDL_bool SDL_Fcitx_Init(void)
{
fcitx_client.dbus = SDL_DBus_GetContext();
@@ -404,8 +402,7 @@ void SDL_Fcitx_Reset(void)
FcitxClientICCallMethod(&fcitx_client, "CloseIC");
}
-SDL_bool
-SDL_Fcitx_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
+SDL_bool SDL_Fcitx_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
{
Uint32 mod_state = Fcitx_ModState();
Uint32 handled = SDL_FALSE;
diff --git a/src/core/linux/SDL_ibus.c b/src/core/linux/SDL_ibus.c
index 5d97c58401c0..4b5d4bbe083c 100644
--- a/src/core/linux/SDL_ibus.c
+++ b/src/core/linux/SDL_ibus.c
@@ -556,8 +556,7 @@ static SDL_bool IBus_CheckConnection(SDL_DBusContext *dbus)
return SDL_FALSE;
}
-SDL_bool
-SDL_IBus_Init(void)
+SDL_bool SDL_IBus_Init(void)
{
SDL_bool result = SDL_FALSE;
SDL_DBusContext *dbus = SDL_DBus_GetContext();
@@ -672,8 +671,7 @@ void SDL_IBus_Reset(void)
IBus_SimpleMessage("Reset");
}
-SDL_bool
-SDL_IBus_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
+SDL_bool SDL_IBus_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
{
Uint32 result = 0;
SDL_DBusContext *dbus = SDL_DBus_GetContext();
diff --git a/src/core/linux/SDL_ime.c b/src/core/linux/SDL_ime.c
index 873709b05b4f..45bc1c6c65f6 100644
--- a/src/core/linux/SDL_ime.c
+++ b/src/core/linux/SDL
(Patch may be truncated, please check the link at the top of this post.)