From c963f02571ef7d5481976a30724db89009bf860f Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Wed, 8 Mar 2023 16:12:45 +0100
Subject: [PATCH] More fix warnings about static function and prototype
---
src/joystick/hidapi/SDL_hidapijoystick.c | 2 +-
src/test/SDL_test_fuzzer.c | 28 +++++------
src/test/SDL_test_harness.c | 2 +-
src/test/SDL_test_memory.c | 4 +-
src/video/kmsdrm/SDL_kmsdrmvideo.c | 2 +-
test/testatomic.c | 7 +--
test/testaudiocapture.c | 5 +-
test/testautomation_audio.c | 1 +
test/testautomation_clipboard.c | 17 ++++---
test/testautomation_events.c | 7 +--
test/testautomation_guid.c | 1 +
test/testautomation_hints.c | 11 +++--
test/testautomation_images.c | 22 ++++-----
test/testautomation_joystick.c | 4 +-
test/testautomation_keyboard.c | 33 +++++++------
test/testautomation_main.c | 3 +-
test/testautomation_math.c | 1 +
test/testautomation_mouse.c | 27 +++++-----
test/testautomation_pixels.c | 1 +
test/testautomation_platform.c | 23 ++++-----
test/testautomation_rect.c | 63 ++++++++++++------------
test/testautomation_render.c | 27 +++++-----
test/testautomation_rwops.c | 27 +++++-----
test/testautomation_sdltest.c | 31 ++++++------
test/testautomation_stdlib.c | 11 +++--
test/testautomation_surface.c | 34 ++++++-------
test/testautomation_syswm.c | 3 +-
test/testautomation_timer.c | 9 ++--
test/testautomation_video.c | 45 ++++++++---------
test/testerror.c | 2 +-
test/testgl.c | 6 +--
test/testgles2.c | 20 ++++----
test/testhittesting.c | 4 +-
test/testlock.c | 8 +--
test/testplatform.c | 12 ++---
test/testrelative.c | 6 +--
test/testsurround.c | 8 ++-
test/testthread.c | 2 +-
38 files changed, 262 insertions(+), 257 deletions(-)
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index 5bfdc312af92..b48d45f57ba1 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -964,7 +964,7 @@ static void HIDAPI_DelDevice(SDL_HIDAPI_Device *device)
}
}
-static SDL_bool HIDAPI_CreateCombinedJoyCons()
+static SDL_bool HIDAPI_CreateCombinedJoyCons(void)
{
SDL_HIDAPI_Device *device, *combined;
SDL_HIDAPI_Device *joycons[2] = { NULL, NULL };
diff --git a/src/test/SDL_test_fuzzer.c b/src/test/SDL_test_fuzzer.c
index e1c07dd8afc4..f288a91c3260 100644
--- a/src/test/SDL_test_fuzzer.c
+++ b/src/test/SDL_test_fuzzer.c
@@ -52,19 +52,19 @@ void SDLTest_FuzzerInit(Uint64 execKey)
fuzzerInvocationCounter = 0;
}
-int SDLTest_GetFuzzerInvocationCount()
+int SDLTest_GetFuzzerInvocationCount(void)
{
return fuzzerInvocationCounter;
}
-Uint8 SDLTest_RandomUint8()
+Uint8 SDLTest_RandomUint8(void)
{
fuzzerInvocationCounter++;
return (Uint8)SDLTest_RandomInt(&rndContext) & 0x000000FF;
}
-Sint8 SDLTest_RandomSint8()
+Sint8 SDLTest_RandomSint8(void)
{
fuzzerInvocationCounter++;
@@ -72,7 +72,7 @@ Sint8 SDLTest_RandomSint8()
}
Uint16
-SDLTest_RandomUint16()
+SDLTest_RandomUint16(void)
{
fuzzerInvocationCounter++;
@@ -80,7 +80,7 @@ SDLTest_RandomUint16()
}
Sint16
-SDLTest_RandomSint16()
+SDLTest_RandomSint16(void)
{
fuzzerInvocationCounter++;
@@ -88,7 +88,7 @@ SDLTest_RandomSint16()
}
Sint32
-SDLTest_RandomSint32()
+SDLTest_RandomSint32(void)
{
fuzzerInvocationCounter++;
@@ -96,7 +96,7 @@ SDLTest_RandomSint32()
}
Uint32
-SDLTest_RandomUint32()
+SDLTest_RandomUint32(void)
{
fuzzerInvocationCounter++;
@@ -104,7 +104,7 @@ SDLTest_RandomUint32()
}
Uint64
-SDLTest_RandomUint64()
+SDLTest_RandomUint64(void)
{
union
{
@@ -122,7 +122,7 @@ SDLTest_RandomUint64()
}
Sint64
-SDLTest_RandomSint64()
+SDLTest_RandomSint64(void)
{
union
{
@@ -422,24 +422,24 @@ SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL_bool v
validDomain);
}
-float SDLTest_RandomUnitFloat()
+float SDLTest_RandomUnitFloat(void)
{
return SDLTest_RandomUint32() / (float)UINT_MAX;
}
-float SDLTest_RandomFloat()
+float SDLTest_RandomFloat(void)
{
return (float)(SDLTest_RandomUnitDouble() * 2.0 * (double)FLT_MAX - (double)(FLT_MAX));
}
double
-SDLTest_RandomUnitDouble()
+SDLTest_RandomUnitDouble(void)
{
return (double)(SDLTest_RandomUint64() >> 11) * (1.0 / 9007199254740992.0);
}
double
-SDLTest_RandomDouble()
+SDLTest_RandomDouble(void)
{
double r = 0.0;
double s = 1.0;
@@ -454,7 +454,7 @@ SDLTest_RandomDouble()
}
char *
-SDLTest_RandomAsciiString()
+SDLTest_RandomAsciiString(void)
{
return SDLTest_RandomAsciiStringWithMaximumLength(255);
}
diff --git a/src/test/SDL_test_harness.c b/src/test/SDL_test_harness.c
index 1ca53b868a12..80ec62d21380 100644
--- a/src/test/SDL_test_harness.c
+++ b/src/test/SDL_test_harness.c
@@ -334,7 +334,7 @@ static void SDLTest_LogTestSuiteSummary(SDLTest_TestSuiteReference *testSuites)
#endif
/* Gets a timer value in seconds */
-static float GetClock()
+static float GetClock(void)
{
float currentClock = SDL_GetPerformanceCounter() / (float)SDL_GetPerformanceFrequency();
return currentClock;
diff --git a/src/test/SDL_test_memory.c b/src/test/SDL_test_memory.c
index f8865b2168a2..95d5b73f768e 100644
--- a/src/test/SDL_test_memory.c
+++ b/src/test/SDL_test_memory.c
@@ -190,7 +190,7 @@ static void SDLCALL SDLTest_TrackedFree(void *ptr)
SDL_free_orig(ptr);
}
-int SDLTest_TrackAllocations()
+int SDLTest_TrackAllocations(void)
{
if (SDL_malloc_orig) {
return 0;
@@ -215,7 +215,7 @@ int SDLTest_TrackAllocations()
return 0;
}
-void SDLTest_LogAllocations()
+void SDLTest_LogAllocations(void)
{
char *message = NULL;
size_t message_size = 0;
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
index 2055bb672820..1225f27be80f 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
@@ -626,7 +626,7 @@ static SDL_bool KMSDRM_ConnectorCheckVrrCapable(uint32_t drm_fd,
return SDL_FALSE;
}
-void KMSDRM_CrtcSetVrr(uint32_t drm_fd, uint32_t crtc_id, SDL_bool enabled)
+static void KMSDRM_CrtcSetVrr(uint32_t drm_fd, uint32_t crtc_id, SDL_bool enabled)
{
uint32_t vrr_prop_id;
if (!KMSDRM_VrrPropId(drm_fd, crtc_id, &vrr_prop_id)) {
diff --git a/test/testatomic.c b/test/testatomic.c
index aace3a06e9f0..da41d02f0814 100644
--- a/test/testatomic.c
+++ b/test/testatomic.c
@@ -31,7 +31,7 @@ tf(SDL_bool _tf)
return f;
}
-static void RunBasicTest()
+static void RunBasicTest(void)
{
int value;
SDL_SpinLock lock = 0;
@@ -107,11 +107,8 @@ enum
SDL_COMPILE_TIME_ASSERT(size, CountTo_GreaterThanZero); /* check for rollover */
static SDL_atomic_t good = { 42 };
-
static atomicValue bad = 42;
-
static SDL_atomic_t threadsRunning;
-
static SDL_sem *threadDone;
static int SDLCALL adder(void *junk)
@@ -153,7 +150,7 @@ static void runAdder(void)
SDL_Log("Finished in %f sec\n", (end - start) / 1000000000.0);
}
-static void RunEpicTest()
+static void RunEpicTest(void)
{
int b;
atomicValue v;
diff --git a/test/testaudiocapture.c b/test/testaudiocapture.c
index 9d613644842c..156b379403fa 100644
--- a/test/testaudiocapture.c
+++ b/test/testaudiocapture.c
@@ -25,8 +25,7 @@ static SDL_AudioSpec spec;
static SDL_AudioDeviceID devid_in = 0;
static SDL_AudioDeviceID devid_out = 0;
-static void
-loop()
+static void loop(void)
{
SDL_bool please_quit = SDL_FALSE;
SDL_Event e;
@@ -164,5 +163,5 @@ int main(int argc, char **argv)
}
#endif
- return 0;
+ /* return 0; */
}
diff --git a/test/testautomation_audio.c b/test/testautomation_audio.c
index 6fb479351b2e..6b100eb908d8 100644
--- a/test/testautomation_audio.c
+++ b/test/testautomation_audio.c
@@ -12,6 +12,7 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/* ================= Test Case Implementation ================== */
diff --git a/test/testautomation_clipboard.c b/test/testautomation_clipboard.c
index d94cad922861..e94be1a7337f 100644
--- a/test/testautomation_clipboard.c
+++ b/test/testautomation_clipboard.c
@@ -3,6 +3,7 @@
*/
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/* ================= Test Case Implementation ================== */
@@ -13,7 +14,7 @@
*
* \sa SDL_HasClipboardText
*/
-int clipboard_testHasClipboardText(void *arg)
+static int clipboard_testHasClipboardText(void *arg)
{
SDL_HasClipboardText();
SDLTest_AssertPass("Call to SDL_HasClipboardText succeeded");
@@ -26,7 +27,7 @@ int clipboard_testHasClipboardText(void *arg)
*
* \sa SDL_HasPrimarySelectionText
*/
-int clipboard_testHasPrimarySelectionText(void *arg)
+static int clipboard_testHasPrimarySelectionText(void *arg)
{
SDL_HasPrimarySelectionText();
SDLTest_AssertPass("Call to SDL_HasPrimarySelectionText succeeded");
@@ -39,7 +40,7 @@ int clipboard_testHasPrimarySelectionText(void *arg)
*
* \sa SDL_GetClipboardText
*/
-int clipboard_testGetClipboardText(void *arg)
+static int clipboard_testGetClipboardText(void *arg)
{
char *charResult;
charResult = SDL_GetClipboardText();
@@ -55,7 +56,7 @@ int clipboard_testGetClipboardText(void *arg)
*
* \sa SDL_GetPrimarySelectionText
*/
-int clipboard_testGetPrimarySelectionText(void *arg)
+static int clipboard_testGetPrimarySelectionText(void *arg)
{
char *charResult;
charResult = SDL_GetPrimarySelectionText();
@@ -70,7 +71,7 @@ int clipboard_testGetPrimarySelectionText(void *arg)
* \brief Check call to SDL_SetClipboardText
* \sa SDL_SetClipboardText
*/
-int clipboard_testSetClipboardText(void *arg)
+static int clipboard_testSetClipboardText(void *arg)
{
char *textRef = SDLTest_RandomAsciiString();
char *text = SDL_strdup(textRef);
@@ -97,7 +98,7 @@ int clipboard_testSetClipboardText(void *arg)
* \brief Check call to SDL_SetPrimarySelectionText
* \sa SDL_SetPrimarySelectionText
*/
-int clipboard_testSetPrimarySelectionText(void *arg)
+static int clipboard_testSetPrimarySelectionText(void *arg)
{
char *textRef = SDLTest_RandomAsciiString();
char *text = SDL_strdup(textRef);
@@ -126,7 +127,7 @@ int clipboard_testSetPrimarySelectionText(void *arg)
* \sa SDL_GetClipboardText
* \sa SDL_SetClipboardText
*/
-int clipboard_testClipboardTextFunctions(void *arg)
+static int clipboard_testClipboardTextFunctions(void *arg)
{
char *textRef = SDLTest_RandomAsciiString();
char *text = SDL_strdup(textRef);
@@ -203,7 +204,7 @@ int clipboard_testClipboardTextFunctions(void *arg)
* \sa SDL_GetPrimarySelectionText
* \sa SDL_SetPrimarySelectionText
*/
-int clipboard_testPrimarySelectionTextFunctions(void *arg)
+static int clipboard_testPrimarySelectionTextFunctions(void *arg)
{
char *textRef = SDLTest_RandomAsciiString();
char *text = SDL_strdup(textRef);
diff --git a/test/testautomation_events.c b/test/testautomation_events.c
index e246f35de537..99da3ba5ee93 100644
--- a/test/testautomation_events.c
+++ b/test/testautomation_events.c
@@ -3,6 +3,7 @@
*/
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/* ================= Test Case Implementation ================== */
@@ -42,7 +43,7 @@ static int SDLCALL events_sampleNullEventFilter(void *userdata, SDL_Event *event
* \sa SDL_PumpEvents
* \sa SDL_PollEvent
*/
-int events_pushPumpAndPollUserevent(void *arg)
+static int events_pushPumpAndPollUserevent(void *arg)
{
SDL_Event event1;
SDL_Event event2;
@@ -75,7 +76,7 @@ int events_pushPumpAndPollUserevent(void *arg)
* \sa SDL_DelEventWatch
*
*/
-int events_addDelEventWatch(void *arg)
+static int events_addDelEventWatch(void *arg)
{
SDL_Event event;
@@ -124,7 +125,7 @@ int events_addDelEventWatch(void *arg)
* \sa SDL_DelEventWatch
*
*/
-int events_addDelEventWatchWithUserdata(void *arg)
+static int events_addDelEventWatchWithUserdata(void *arg)
{
SDL_Event event;
diff --git a/test/testautomation_guid.c b/test/testautomation_guid.c
index 960dabfbb283..6488e58252de 100644
--- a/test/testautomation_guid.c
+++ b/test/testautomation_guid.c
@@ -4,6 +4,7 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/* ================= Test Case Implementation ================== */
diff --git a/test/testautomation_hints.c b/test/testautomation_hints.c
index b7919f336480..aa65e276add3 100644
--- a/test/testautomation_hints.c
+++ b/test/testautomation_hints.c
@@ -4,8 +4,9 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
-const char *HintsEnum[] = {
+static const char *HintsEnum[] = {
SDL_HINT_ACCELEROMETER_AS_JOYSTICK,
SDL_HINT_FRAMEBUFFER_ACCELERATION,
SDL_HINT_GAMECONTROLLERCONFIG,
@@ -28,7 +29,7 @@ const char *HintsEnum[] = {
SDL_HINT_VIDEO_X11_XRANDR,
SDL_HINT_XINPUT_ENABLED,
};
-const char *HintsVerbose[] = {
+static const char *HintsVerbose[] = {
"SDL_ACCELEROMETER_AS_JOYSTICK",
"SDL_FRAMEBUFFER_ACCELERATION",
"SDL_GAMECONTROLLERCONFIG",
@@ -54,14 +55,14 @@ const char *HintsVerbose[] = {
SDL_COMPILE_TIME_ASSERT(HintsEnum, SDL_arraysize(HintsEnum) == SDL_arraysize(HintsVerbose));
-const int numHintsEnum = SDL_arraysize(HintsEnum);
+static const int numHintsEnum = SDL_arraysize(HintsEnum);
/* Test case functions */
/**
* \brief Call to SDL_GetHint
*/
-int hints_getHint(void *arg)
+static int hints_getHint(void *arg)
{
const char *result1;
const char *result2;
@@ -90,7 +91,7 @@ static void SDLCALL hints_testHintChanged(void *userdata, const char *name, cons
/**
* \brief Call to SDL_SetHint
*/
-int hints_setHint(void *arg)
+static int hints_setHint(void *arg)
{
const char *testHint = "SDL_AUTOMATED_TEST_HINT";
const char *originalValue;
diff --git a/test/testautomation_images.c b/test/testautomation_images.c
index 3577404e0f8c..389d70151bd1 100644
--- a/test/testautomation_images.c
+++ b/test/testautomation_images.c
@@ -530,7 +530,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlit = {
/**
* \brief Returns the Blit test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageBlit()
+SDL_Surface *SDLTest_ImageBlit(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageBlit.pixel_data,
@@ -1002,7 +1002,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitColor = {
/**
* \brief Returns the BlitColor test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageBlitColor()
+SDL_Surface *SDLTest_ImageBlitColor(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageBlitColor.pixel_data,
@@ -1637,7 +1637,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitAlpha = {
/**
* \brief Returns the BlitAlpha test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageBlitAlpha()
+SDL_Surface *SDLTest_ImageBlitAlpha(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageBlitAlpha.pixel_data,
@@ -2205,7 +2205,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendAdd = {
/**
* \brief Returns the BlitBlendAdd test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageBlitBlendAdd()
+SDL_Surface *SDLTest_ImageBlitBlendAdd(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageBlitBlendAdd.pixel_data,
@@ -2794,7 +2794,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlend = {
/**
* \brief Returns the BlitBlend test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageBlitBlend()
+SDL_Surface *SDLTest_ImageBlitBlend(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageBlitBlend.pixel_data,
@@ -3213,7 +3213,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendMod = {
/**
* \brief Returns the BlitBlendMod test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageBlitBlendMod()
+SDL_Surface *SDLTest_ImageBlitBlendMod(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageBlitBlendMod.pixel_data,
@@ -4015,7 +4015,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendNone = {
/**
* \brief Returns the BlitBlendNone test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageBlitBlendNone()
+SDL_Surface *SDLTest_ImageBlitBlendNone(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageBlitBlendNone.pixel_data,
@@ -4549,7 +4549,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendAll = {
/**
* \brief Returns the BlitBlendAll test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageBlitBlendAll()
+SDL_Surface *SDLTest_ImageBlitBlendAll(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageBlitBlendAll.pixel_data,
@@ -4760,7 +4760,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageFace = {
/**
* \brief Returns the Face test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImageFace()
+SDL_Surface *SDLTest_ImageFace(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imageFace.pixel_data,
@@ -5253,7 +5253,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imagePrimitives = {
/**
* \brief Returns the Primitives test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImagePrimitives()
+SDL_Surface *SDLTest_ImagePrimitives(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imagePrimitives.pixel_data,
@@ -5918,7 +5918,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imagePrimitivesBlend = {
/**
* \brief Returns the PrimitivesBlend test image as SDL_Surface.
*/
-SDL_Surface *SDLTest_ImagePrimitivesBlend()
+SDL_Surface *SDLTest_ImagePrimitivesBlend(void)
{
SDL_Surface *surface = SDL_CreateSurfaceFrom(
(void *)SDLTest_imagePrimitivesBlend.pixel_data,
diff --git a/test/testautomation_joystick.c b/test/testautomation_joystick.c
index d3420f338158..54b9b3e486ab 100644
--- a/test/testautomation_joystick.c
+++ b/test/testautomation_joystick.c
@@ -5,6 +5,7 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
#include "../src/joystick/usb_ids.h"
+#include "testautomation_suites.h"
/* ================= Test Case Implementation ================== */
@@ -15,8 +16,7 @@
*
* \sa SDL_AttachVirtualJoystickEx
*/
-static int
-TestVirtualJoystick(void *arg)
+static int TestVirtualJoystick(void *arg)
{
SDL_VirtualJoystickDesc desc;
SDL_Joystick *joystick = NULL;
diff --git a/test/testautomation_keyboard.c b/test/testautomation_keyboard.c
index d542deeda333..cc29919c773b 100644
--- a/test/testautomation_keyboard.c
+++ b/test/testautomation_keyboard.c
@@ -4,6 +4,7 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/* ================= Test Case Implementation ================== */
@@ -14,7 +15,7 @@
*
* \sa SDL_GetKeyboardState
*/
-int keyboard_getKeyboardState(void *arg)
+static int keyboard_getKeyboardState(void *arg)
{
int numkeys;
Uint8 *state;
@@ -39,7 +40,7 @@ int keyboard_getKeyboardState(void *arg)
*
* \sa SDL_GetKeyboardFocus
*/
-int keyboard_getKeyboardFocus(void *arg)
+static int keyboard_getKeyboardFocus(void *arg)
{
/* Call, but ignore return value */
SDL_GetKeyboardFocus();
@@ -53,7 +54,7 @@ int keyboard_getKeyboardFocus(void *arg)
*
* \sa SDL_GetKeyFromName
*/
-int keyboard_getKeyFromName(void *arg)
+static int keyboard_getKeyFromName(void *arg)
{
SDL_Keycode result;
@@ -98,7 +99,7 @@ int keyboard_getKeyFromName(void *arg)
/*
* Local helper to check for the invalid scancode error message
*/
-static void checkInvalidScancodeError()
+static void checkInvalidScancodeError(void)
{
const char *expectedError = "Parameter 'scancode' is invalid";
const char *error;
@@ -118,7 +119,7 @@ static void checkInvalidScancodeError()
*
* \sa SDL_GetKeyFromScancode
*/
-int keyboard_getKeyFromScancode(void *arg)
+static int keyboard_getKeyFromScancode(void *arg)
{
SDL_Keycode result;
@@ -156,7 +157,7 @@ int keyboard_getKeyFromScancode(void *arg)
*
* \sa SDL_GetKeyName
*/
-int keyboard_getKeyName(void *arg)
+static int keyboard_getKeyName(void *arg)
{
const char *result;
const char *expected;
@@ -211,7 +212,7 @@ int keyboard_getKeyName(void *arg)
*
* \sa SDL_GetScancodeName
*/
-int keyboard_getScancodeNameNegative(void *arg)
+static int keyboard_getScancodeNameNegative(void *arg)
{
SDL_Scancode scancode;
const char *result;
@@ -237,7 +238,7 @@ int keyboard_getScancodeNameNegative(void *arg)
*
* \sa SDL_GetKeyName
*/
-int keyboard_getKeyNameNegative(void *arg)
+static int keyboard_getKeyNameNegative(void *arg)
{
SDL_Keycode keycode;
const char *result;
@@ -274,7 +275,7 @@ int keyboard_getKeyNameNegative(void *arg)
* \sa SDL_GetModState
* \sa SDL_SetModState
*/
-int keyboard_getSetModState(void *arg)
+static int keyboard_getSetModState(void *arg)
{
SDL_Keymod result;
SDL_Keymod currentState;
@@ -333,7 +334,7 @@ int keyboard_getSetModState(void *arg)
* \sa SDL_StartTextInput
* \sa SDL_StopTextInput
*/
-int keyboard_startStopTextInput(void *arg)
+static int keyboard_startStopTextInput(void *arg)
{
/* Start-Stop */
SDL_StartTextInput();
@@ -378,7 +379,7 @@ static void testSetTextInputRect(SDL_Rect refRect)
*
* \sa SDL_SetTextInputRect
*/
-int keyboard_setTextInputRect(void *arg)
+static int keyboard_setTextInputRect(void *arg)
{
SDL_Rect refRect;
@@ -457,7 +458,7 @@ int keyboard_setTextInputRect(void *arg)
*
* \sa SDL_SetTextInputRect
*/
-int keyboard_setTextInputRectNegative(void *arg)
+static int keyboard_setTextInputRectNegative(void *arg)
{
/* Some platforms set also an error message; prepare for checking it */
#if SDL_VIDEO_DRIVER_WINDOWS || SDL_VIDEO_DRIVER_ANDROID || SDL_VIDEO_DRIVER_COCOA
@@ -495,7 +496,7 @@ int keyboard_setTextInputRectNegative(void *arg)
* \sa SDL_GetScancodeFromKey
* \sa SDL_Keycode
*/
-int keyboard_getScancodeFromKey(void *arg)
+static int keyboard_getScancodeFromKey(void *arg)
{
SDL_Scancode scancode;
@@ -518,7 +519,7 @@ int keyboard_getScancodeFromKey(void *arg)
* \sa SDL_GetScancodeFromName
* \sa SDL_Keycode
*/
-int keyboard_getScancodeFromName(void *arg)
+static int keyboard_getScancodeFromName(void *arg)
{
SDL_Scancode scancode;
@@ -568,7 +569,7 @@ int keyboard_getScancodeFromName(void *arg)
/*
* Local helper to check for the invalid scancode error message
*/
-static void checkInvalidNameError()
+static void checkInvalidNameError(void)
{
const char *expectedError = "Parameter 'name' is invalid";
const char *error;
@@ -589,7 +590,7 @@ static void checkInvalidNameError()
* \sa SDL_GetScancodeFromName
* \sa SDL_Keycode
*/
-int keyboard_getScancodeFromNameNegative(void *arg)
+static int keyboard_getScancodeFromNameNegative(void *arg)
{
const char *name;
SDL_Scancode scancode;
diff --git a/test/testautomation_main.c b/test/testautomation_main.c
index acdd5ee7c273..7c350eda1530 100644
--- a/test/testautomation_main.c
+++ b/test/testautomation_main.c
@@ -8,6 +8,7 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/**
* \brief Tests SDL_InitSubSystem() and SDL_QuitSubSystem()
@@ -37,7 +38,7 @@ static int main_testInitQuitSubSystem(void *arg)
return TEST_COMPLETED;
}
-const int joy_and_controller = SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD;
+static const int joy_and_controller = SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD;
static int main_testImpliedJoystickInit(void *arg)
{
int initialized_system;
diff --git a/test/testautomation_math.c b/test/testautomation_math.c
index a2bf9d7f5a11..863ed21b5ca6 100644
--- a/test/testautomation_math.c
+++ b/test/testautomation_math.c
@@ -7,6 +7,7 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/* ================= Test Constants ================== */
diff --git a/test/testautomation_mouse.c b/test/testautomation_mouse.c
index cd3ffa5983d5..b0a9484961a4 100644
--- a/test/testautomation_mouse.c
+++ b/test/testautomation_mouse.c
@@ -6,6 +6,7 @@
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
#include "testautomation_images.h"
/* ================= Test Case Implementation ================== */
@@ -27,7 +28,7 @@ static int mouseStateCheck(Uint32 state)
* \brief Check call to SDL_GetMouseState
*
*/
-int mouse_getMouseState(void *arg)
+static int mouse_getMouseState(void *arg)
{
float x;
float y;
@@ -72,7 +73,7 @@ int mouse_getMouseState(void *arg)
* \brief Check call to SDL_GetRelativeMouseState
*
*/
-int mouse_getRelativeMouseState(void *arg)
+static int mouse_getRelativeMouseState(void *arg)
{
float x;
float y;
@@ -192,7 +193,7 @@ static SDL_Cursor *initArrowCursor(const char *image[])
* \sa SDL_CreateCursor
* \sa SDL_DestroyCursor
*/
-int mouse_createFreeCursor(void *arg)
+static int mouse_createFreeCursor(void *arg)
{
SDL_Cursor *cursor;
@@ -217,7 +218,7 @@ int mouse_createFreeCursor(void *arg)
* \sa SDL_CreateColorCursor
* \sa SDL_DestroyCursor
*/
-int mouse_createFreeColorCursor(void *arg)
+static int mouse_createFreeColorCursor(void *arg)
{
SDL_Surface *face;
SDL_Cursor *cursor;
@@ -272,7 +273,7 @@ static void changeCursorVisibility(SDL_bool state)
*
* \sa SDL_ShowCursor
*/
-int mouse_showCursor(void *arg)
+static int mouse_showCursor(void *arg)
{
SDL_bool currentState;
@@ -297,7 +298,7 @@ int mouse_showCursor(void *arg)
*
* \sa SDL_SetCursor
*/
-int mouse_setCursor(void *arg)
+static int mouse_setCursor(void *arg)
{
SDL_Cursor *cursor;
@@ -329,7 +330,7 @@ int mouse_setCursor(void *arg)
*
* \sa SDL_GetCursor
*/
-int mouse_getCursor(void *arg)
+static int mouse_getCursor(void *arg)
{
SDL_Cursor *cursor;
@@ -347,7 +348,7 @@ int mouse_getCursor(void *arg)
* \sa SDL_GetRelativeMouseMode
* \sa SDL_SetRelativeMouseMode
*/
-int mouse_getSetRelativeMouseMode(void *arg)
+static int mouse_getSetRelativeMouseMode(void *arg)
{
int result;
int i;
@@ -402,7 +403,7 @@ int mouse_getSetRelativeMouseMode(void *arg)
/**
* Creates a test window
*/
-static SDL_Window *createMouseSuiteTestWindow()
+static SDL_Window *createMouseSuiteTestWindow(void)
{
int width = MOUSE_TESTWINDOW_WIDTH, height = MOUSE_TESTWINDOW_HEIGHT;
SDL_Window *window;
@@ -429,7 +430,7 @@ static void destroyMouseSuiteTestWindow(SDL_Window *window)
*
* \sa SDL_WarpMouseInWindow
*/
-int mouse_warpMouseInWindow(void *arg)
+static int mouse_warpMouseInWindow(void *arg)
{
const int w = MOUSE_TESTWINDOW_WIDTH, h = MOUSE_TESTWINDOW_HEIGHT;
int numPositions = 6;
@@ -492,7 +493,7 @@ int mouse_warpMouseInWindow(void *arg)
*
* \sa SDL_GetMouseFocus
*/
-int mouse_getMouseFocus(void *arg)
+static int mouse_getMouseFocus(void *arg)
{
const int w = MOUSE_TESTWINDOW_WIDTH, h = MOUSE_TESTWINDOW_HEIGHT;
float x, y;
@@ -552,7 +553,7 @@ int mouse_getMouseFocus(void *arg)
*
* \sa SDL_GetDefaultCursor
*/
-int mouse_getDefaultCursor(void *arg)
+static int mouse_getDefaultCursor(void *arg)
{
SDL_Cursor *cursor;
@@ -569,7 +570,7 @@ int mouse_getDefaultCursor(void *arg)
*
* \sa SDL_GetGlobalMouseState
*/
-int mouse_getGlobalMouseState(void *arg)
+static int mouse_getGlobalMouseState(void *arg)
{
float x;
float y;
diff --git a/test/testautomation_pixels.c b/test/testautomation_pixels.c
index 53155c2df38c..3df9165f377d 100644
--- a/test/testautomation_pixels.c
+++ b/test/testautomation_pixels.c
@@ -3,6 +3,7 @@
*/
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/* Test case functions */
diff --git a/test/testautomation_platform.c b/test/testautomation_platform.c
index f1fdb16f99e8..43130b8fcd44 100644
--- a/test/testautomation_platform.c
+++ b/test/testautomation_platform.c
@@ -4,6 +4,7 @@
*/
#include <SDL3/SDL.h>
#include <SDL3/SDL_test.h>
+#include "testautomation_suites.h"
/* ================= Test Case Implementation ================== */
@@ -26,7 +27,7 @@ static int compareSizeOfType(size_t sizeoftype, size_t hardcodetype)
/**
* \brief Tests type sizes.
*/
-int platform_testTypes(void *arg)
+static int platform_testTypes(void *arg)
{
int ret;
@@ -48,7 +49,7 @@ int platform_testTypes(void *arg)
/**
* \brief Tests platform endianness and SDL_SwapXY functions.
*/
-int platform_testEndianessAndSwap(void *arg)
+static int platform_testEndianessAndSwap(void *arg)
{
int real_byteorder;
int real_floatwordorder = 0;
@@ -123,7 +124,7 @@ int platform_testEndianessAndSwap(void *arg)
* \sa SDL_GetRevision
* \sa SDL_GetCPUCacheLineSize
*/
-int platform_testGetFunctions(void *arg)
+static int platform_testGetFunctions(void *arg)
{
char *platform;
char *revision;
@@ -172,7 +173,7 @@ int platform_testGetFunctions(void *arg)
* \sa SDL_HasSSE42
* \sa SDL_HasAVX
*/
-int platform_testHasFunctions(void *arg)
+static int platform_testHasFunctions(void *arg)
{
/* TODO: independently determine and compare values as well */
@@ -210,7 +211,7 @@ int platform_testHasFunctions(void *arg)
* \brief Tests SDL_GetVersion
* \sa SDL_GetVersion
*/
-int platform_testGetVersion(void *arg)
+static int platform_testGetVersion(void *arg)
{
SDL_version linked;
int major = SDL_MAJOR_VERSION;
@@ -232,7 +233,7 @@ int platform_testGetVersion(void *arg)
/**
* \brief Tests SDL_VERSION macro
*/
-int platform_testSDLVersion(void *arg)
+static int platform_testSDLVersion(void *arg)
{
SDL_version compiled;
int major = SDL_MAJOR_VERSION;
@@ -254,7 +255,7 @@ int platform_testSDLVersion(void *arg)
/**
* \brief Tests default SDL_Init
*/
-int platform_testDefaultInit(void *arg)
+static int platform_testDefaultInit(void *arg)
{
int ret;
int subsystem;
@@ -279,7 +280,7 @@ int platform_testDefaultInit(void *arg)
* \sa SDL_SetError
* \sa SDL_ClearError
*/
-int platform_testGetSetClearError(void *arg)
+static int platform_testGetSetClearError(void *arg)
{
int result;
const char *testError = "Testing";
@@ -328,7 +329,7 @@ int platform_testGetSetClearError(void *arg)
* \brief Tests SDL_SetError with empty input
* \sa SDL_SetError
*/
-int platform_testSetErrorEmptyInput(void *arg)
+static int platform_testSetErrorEmptyInput(void *arg)
{
int result;
const char *testError = "";
@@ -369,7 +370,7 @@ int platform_testSetErrorEmptyInput(void *arg)
* \brief Tests SDL_SetError with invalid input
* \sa SDL_SetError
*/
-int platform_testSetErrorInvalidInput(void *arg)
+static int platform_testSetErrorInvalidInput(void *arg)
{
int result;
const char *invalidError = NULL;
@@ -452,7 +453,7 @@ int platform_testSetErrorInvalidInput(void *arg)
* \brief Tests SDL_GetPowerInfo
* \sa SDL_GetPowerInfo
*/
-int platform_testGetPowerInfo(void *arg)
+static int platf
(Patch may be truncated, please check the link at the top of this post.)