Fix warning for Android NDK compiler: "function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]"

https://stackoverflow.com/questions/42125/warning-error-function-declaration-isnt-a-prototype
In C int foo() and int foo(void) are different functions. int foo() accepts an arbitrary number of arguments, while int foo(void) accepts 0 arguments. In C++ they mean the same thing.
This commit is contained in:
Amir
2024-07-17 21:32:03 +04:00
committed by Sam Lantinga
parent 3f9591babe
commit ccade50587
89 changed files with 210 additions and 210 deletions

View File

@@ -107,7 +107,7 @@ print_modifiers(char **text, size_t *maxlen)
}
static void
PrintModifierState()
PrintModifierState(void)
{
char message[512];
char *spot;
@@ -166,7 +166,7 @@ PrintText(const char *eventtype, const char *text)
SDL_Log("%s Text (%s): \"%s%s\"\n", eventtype, expanded, *text == '"' ? "\\" : "", text);
}
void loop()
void loop(void)
{
SDL_Event event;
/* Check for events */

View File

@@ -103,7 +103,7 @@ print_modifiers(char **text, size_t *maxlen)
}
static void
PrintModifierState()
PrintModifierState(void)
{
char message[512];
char *spot;
@@ -162,7 +162,7 @@ PrintText(const char *eventtype, const char *text)
SDL_Log("%s Text (%s): \"%s%s\"\n", eventtype, expanded, *text == '"' ? "\\" : "", text);
}
void loop()
void loop(void)
{
SDL_Event event;
/* Check for events */

View File

@@ -46,7 +46,7 @@ quit(int rc)
}
static void
close_audio()
close_audio(void)
{
if (device != 0) {
SDL_CloseAudioDevice(device);
@@ -55,7 +55,7 @@ close_audio()
}
static void
open_audio()
open_audio(void)
{
/* Initialize fillerup() variables */
device = SDL_OpenAudioDevice(NULL, SDL_FALSE, &wave.spec, NULL, 0);
@@ -70,7 +70,7 @@ open_audio()
}
#ifndef __EMSCRIPTEN__
static void reopen_audio()
static void reopen_audio(void)
{
close_audio();
open_audio();
@@ -103,7 +103,7 @@ fillerup(void *unused, Uint8 *stream, int len)
static int done = 0;
#ifdef __EMSCRIPTEN__
void loop()
void loop(void)
{
if (done || (SDL_GetAudioDeviceStatus(device) != SDL_AUDIO_PLAYING)) {
emscripten_cancel_main_loop();

View File

@@ -48,7 +48,7 @@ void poked(int sig)
done = 1;
}
void loop()
void loop(void)
{
#ifdef __EMSCRIPTEN__
if (done || (SDL_GetAudioStatus() != SDL_AUDIO_PLAYING)) {

View File

@@ -31,7 +31,7 @@ tf(SDL_bool _tf)
return f;
}
static void RunBasicTest()
static void RunBasicTest(void)
{
int value;
SDL_SpinLock lock = 0;
@@ -153,7 +153,7 @@ static void runAdder(void)
SDL_Log("Finished in %f sec\n", (end - start) / 1000.f);
}
static void RunEpicTest()
static void RunEpicTest(void)
{
int b;
atomicValue v;

View File

@@ -24,7 +24,7 @@ static SDL_AudioDeviceID devid_in = 0;
static SDL_AudioDeviceID devid_out = 0;
static void
loop()
loop(void)
{
SDL_bool please_quit = SDL_FALSE;
SDL_Event e;

View File

@@ -81,7 +81,7 @@ devtypestr(int iscapture)
}
static void
iteration()
iteration(void)
{
SDL_Event e;
SDL_AudioDeviceID dev;
@@ -124,7 +124,7 @@ iteration()
}
#ifdef __EMSCRIPTEN__
void loop()
void loop(void)
{
if (done)
emscripten_cancel_main_loop();

View File

@@ -96,7 +96,7 @@ static SDL_bool DriverIsProblematic(const char *driver)
* \sa https://wiki.libsdl.org/SDL_QuitSubSystem
* \sa https://wiki.libsdl.org/SDL_InitSubSystem
*/
int audio_quitInitAudioSubSystem()
int audio_quitInitAudioSubSystem(void)
{
/* Stop SDL audio subsystem */
SDL_QuitSubSystem(SDL_INIT_AUDIO);
@@ -114,7 +114,7 @@ int audio_quitInitAudioSubSystem()
* \sa https://wiki.libsdl.org/SDL_InitAudio
* \sa https://wiki.libsdl.org/SDL_QuitAudio
*/
int audio_initQuitAudio()
int audio_initQuitAudio(void)
{
int result;
int i, iMax;
@@ -195,7 +195,7 @@ int audio_initQuitAudio()
* \sa https://wiki.libsdl.org/SDL_CloseAudio
* \sa https://wiki.libsdl.org/SDL_QuitAudio
*/
int audio_initOpenCloseQuitAudio()
int audio_initOpenCloseQuitAudio(void)
{
int result, expectedResult;
int i, iMax, j, k;
@@ -318,7 +318,7 @@ int audio_initOpenCloseQuitAudio()
*
* \sa https://wiki.libsdl.org/SDL_PauseAudio
*/
int audio_pauseUnpauseAudio()
int audio_pauseUnpauseAudio(void)
{
int result;
int i, iMax, j, k, l;
@@ -474,7 +474,7 @@ int audio_pauseUnpauseAudio()
* \sa https://wiki.libsdl.org/SDL_GetNumAudioDevices
* \sa https://wiki.libsdl.org/SDL_GetAudioDeviceName
*/
int audio_enumerateAndNameAudioDevices()
int audio_enumerateAndNameAudioDevices(void)
{
int t, tt;
int i, n, nn;
@@ -532,7 +532,7 @@ int audio_enumerateAndNameAudioDevices()
* \sa https://wiki.libsdl.org/SDL_GetNumAudioDevices
* \sa https://wiki.libsdl.org/SDL_GetAudioDeviceName
*/
int audio_enumerateAndNameAudioDevicesNegativeTests()
int audio_enumerateAndNameAudioDevicesNegativeTests(void)
{
int t;
int i, j, no, nc;
@@ -578,7 +578,7 @@ int audio_enumerateAndNameAudioDevicesNegativeTests()
* \sa https://wiki.libsdl.org/SDL_GetNumAudioDrivers
* \sa https://wiki.libsdl.org/SDL_GetAudioDriver
*/
int audio_printAudioDrivers()
int audio_printAudioDrivers(void)
{
int i, n;
const char *name;
@@ -608,7 +608,7 @@ int audio_printAudioDrivers()
*
* \sa https://wiki.libsdl.org/SDL_GetCurrentAudioDriver
*/
int audio_printCurrentAudioDriver()
int audio_printCurrentAudioDriver(void)
{
/* Check current audio driver */
const char *name = SDL_GetCurrentAudioDriver();
@@ -639,7 +639,7 @@ int _audioFrequencies[] = { 11025, 22050, 44100, 48000 };
*
* \sa https://wiki.libsdl.org/SDL_BuildAudioCVT
*/
int audio_buildAudioCVT()
int audio_buildAudioCVT(void)
{
int result;
SDL_AudioCVT cvt;
@@ -703,7 +703,7 @@ int audio_buildAudioCVT()
*
* \sa https://wiki.libsdl.org/SDL_BuildAudioCVT
*/
int audio_buildAudioCVTNegative()
int audio_buildAudioCVTNegative(void)
{
const char *expectedError = "Parameter 'cvt' is invalid";
const char *error;
@@ -798,7 +798,7 @@ int audio_buildAudioCVTNegative()
*
* \sa https://wiki.libsdl.org/SDL_GetAudioStatus
*/
int audio_getAudioStatus()
int audio_getAudioStatus(void)
{
SDL_AudioStatus result;
@@ -817,7 +817,7 @@ int audio_getAudioStatus()
*
* \sa https://wiki.libsdl.org/SDL_GetAudioStatus
*/
int audio_openCloseAndGetAudioStatus()
int audio_openCloseAndGetAudioStatus(void)
{
SDL_AudioStatus result;
int i;
@@ -878,7 +878,7 @@ int audio_openCloseAndGetAudioStatus()
* \sa https://wiki.libsdl.org/SDL_LockAudioDevice
* \sa https://wiki.libsdl.org/SDL_UnlockAudioDevice
*/
int audio_lockUnlockOpenAudioDevice()
int audio_lockUnlockOpenAudioDevice(void)
{
int i;
int count;
@@ -942,7 +942,7 @@ int audio_lockUnlockOpenAudioDevice()
* \sa https://wiki.libsdl.org/SDL_BuildAudioCVT
* \sa https://wiki.libsdl.org/SDL_ConvertAudio
*/
int audio_convertAudio()
int audio_convertAudio(void)
{
int result;
SDL_AudioCVT cvt;
@@ -1043,7 +1043,7 @@ int audio_convertAudio()
*
* \sa https://wiki.libsdl.org/SDL_AudioDeviceConnected
*/
int audio_openCloseAudioDeviceConnected()
int audio_openCloseAudioDeviceConnected(void)
{
int result = -1;
int i;
@@ -1118,7 +1118,7 @@ static double sine_wave_sample(const Sint64 idx, const Sint64 rate, const Sint64
* \sa https://wiki.libsdl.org/SDL_BuildAudioCVT
* \sa https://wiki.libsdl.org/SDL_ConvertAudio
*/
int audio_resampleLoss()
int audio_resampleLoss(void)
{
/* Note: always test long input time (>= 5s from experience) in some test
* cases because an improper implementation may suffer from low resampling

View File

@@ -102,7 +102,7 @@ int keyboard_getKeyFromName(void *arg)
/*
* Local helper to check for the invalid scancode error message
*/
void _checkInvalidScancodeError()
void _checkInvalidScancodeError(void)
{
const char *expectedError = "Parameter 'scancode' is invalid";
const char *error;
@@ -574,7 +574,7 @@ int keyboard_getScancodeFromName(void *arg)
/*
* Local helper to check for the invalid scancode error message
*/
void _checkInvalidNameError()
void _checkInvalidNameError(void)
{
const char *expectedError = "Parameter 'name' is invalid";
const char *error;

View File

@@ -21,7 +21,7 @@ static void EnableTestLog(int *message_count)
SDL_LogSetOutputFunction(TestLogOutput, message_count);
}
static void DisableTestLog()
static void DisableTestLog(void)
{
SDL_LogSetOutputFunction(original_function, original_userdata);
}

View File

@@ -40,7 +40,7 @@ static void subsystemsTearDown(void *arg)
* \sa SDL_QuitSubSystem
*
*/
static int subsystems_referenceCount()
static int subsystems_referenceCount(void)
{
const int system = SDL_INIT_VIDEO;
int result;
@@ -90,7 +90,7 @@ static int subsystems_referenceCount()
* \sa SDL_QuitSubSystem
*
*/
static int subsystems_dependRefCountInitAllQuitByOne()
static int subsystems_dependRefCountInitAllQuitByOne(void)
{
int result;
/* Ensure that we start with reset subsystems. */
@@ -128,7 +128,7 @@ static int subsystems_dependRefCountInitAllQuitByOne()
* \sa SDL_QuitSubSystem
*
*/
static int subsystems_dependRefCountInitByOneQuitAll()
static int subsystems_dependRefCountInitByOneQuitAll(void)
{
int result;
/* Ensure that we start with reset subsystems. */
@@ -163,7 +163,7 @@ static int subsystems_dependRefCountInitByOneQuitAll()
* \sa SDL_QuitSubSystem
*
*/
static int subsystems_dependRefCountWithExtraInit()
static int subsystems_dependRefCountWithExtraInit(void)
{
int result;
/* Ensure that we start with reset subsystems. */

View File

@@ -81,7 +81,7 @@ void _surfaceTearDown(void *arg)
/**
* Helper that clears the test surface
*/
void _clearTestSurface()
void _clearTestSurface(void)
{
int ret;
Uint32 color;

View File

@@ -624,7 +624,7 @@ int video_getWindowDisplayMode(void *arg)
}
/* Helper function that checks for an 'Invalid window' error */
void _checkInvalidWindowError()
void _checkInvalidWindowError(void)
{
const char *invalidWindowError = "Invalid window";
char *lastError;
@@ -1300,7 +1300,7 @@ int video_getSetWindowPosition(void *arg)
}
/* Helper function that checks for an 'Invalid parameter' error */
void _checkInvalidParameterError()
void _checkInvalidParameterError(void)
{
const char *invalidParameterError = "Parameter";
char *lastError;

View File

@@ -148,7 +148,7 @@ quit(int rc)
exit(rc);
}
void loop()
void loop(void)
{
int i;
SDL_Event event;

View File

@@ -174,7 +174,7 @@ void DrawRects(SDL_Renderer *renderer)
}
}
void loop()
void loop(void)
{
Uint32 now;
int i;

View File

@@ -28,7 +28,7 @@ SDL_Renderer *renderer;
SDL_Surface *surface;
int done;
void DrawChessBoard()
void DrawChessBoard(void)
{
int row = 0, column = 0, x = 0;
SDL_Rect rect, darea;
@@ -53,7 +53,7 @@ void DrawChessBoard()
SDL_RenderPresent(renderer);
}
void loop()
void loop(void)
{
SDL_Event e;
while (SDL_PollEvent(&e)) {

View File

@@ -107,7 +107,7 @@ static int virtual_axis_start_x;
static int virtual_axis_start_y;
static SDL_GameControllerButton virtual_button_active = SDL_CONTROLLER_BUTTON_INVALID;
static void UpdateWindowTitle()
static void UpdateWindowTitle(void)
{
if (!window) {
return;
@@ -329,7 +329,7 @@ typedef struct
Uint8 ucLedBlue; /* 46 */
} DS5EffectsState_t;
static void CyclePS5TriggerEffect()
static void CyclePS5TriggerEffect(void)
{
DS5EffectsState_t state;
@@ -351,7 +351,7 @@ static void CyclePS5TriggerEffect()
SDL_GameControllerSendEffect(gamecontroller, &state, sizeof(state));
}
static SDL_bool ShowingFront()
static SDL_bool ShowingFront(void)
{
SDL_bool showing_front = SDL_TRUE;
int i;
@@ -394,7 +394,7 @@ static int SDLCALL VirtualControllerSetLED(void *userdata, Uint8 red, Uint8 gree
return 0;
}
static void OpenVirtualController()
static void OpenVirtualController(void)
{
SDL_VirtualJoystickDesc desc;
int virtual_index;
@@ -420,7 +420,7 @@ static void OpenVirtualController()
}
}
static void CloseVirtualController()
static void CloseVirtualController(void)
{
int i;

View File

@@ -62,7 +62,7 @@ int LoadSprite(const char *file)
return 0;
}
void loop()
void loop(void)
{
int i;
SDL_Event event;

View File

@@ -78,7 +78,7 @@ quit(int rc)
}
static void
Render()
Render(void)
{
static float color[8][3] = {
{ 1.0, 1.0, 0.0 },

View File

@@ -49,7 +49,7 @@ quit(int rc)
}
static void
Render()
Render(void)
{
static GLubyte color[8][4] = { { 255, 0, 0, 0 },
{ 255, 0, 0, 255 },

View File

@@ -569,7 +569,7 @@ render_thread_fn(void *render_ctx)
}
static void
loop_threaded()
loop_threaded(void)
{
SDL_Event event;
int i;
@@ -598,7 +598,7 @@ loop_threaded()
#endif
static void
loop()
loop(void)
{
SDL_Event event;
int i;

View File

@@ -325,7 +325,7 @@ int done;
Uint32 frames;
shader_data *datas;
void loop()
void loop(void)
{
SDL_Event event;
int i;

View File

@@ -333,7 +333,7 @@ static Sint32 unifont_draw_glyph(Uint32 codepoint, int rendererID, SDL_Rect *dst
return unifontGlyph[codepoint].width;
}
static void unifont_cleanup()
static void unifont_cleanup(void)
{
int i, j;
for (i = 0; i < state->num_windows; ++i) {
@@ -425,12 +425,12 @@ Uint32 utf8_decode(char *p, size_t len)
return codepoint;
}
void usage()
void usage(void)
{
SDL_Log("usage: testime [--font fontfile]\n");
}
void InitInput()
void InitInput(void)
{
/* Prepare a rect for text input */
textRect.x = textRect.y = 100;
@@ -444,7 +444,7 @@ void InitInput()
SDL_StartTextInput();
}
void CleanupVideo()
void CleanupVideo(void)
{
SDL_StopTextInput();
#ifdef HAVE_SDL_TTF
@@ -597,7 +597,7 @@ void _Redraw(int rendererID)
SDL_SetTextInputRect(&markedRect);
}
void Redraw()
void Redraw(void)
{
int i;
for (i = 0; i < state->num_windows; ++i) {

View File

@@ -208,7 +208,7 @@ DrawRectRectIntersections(SDL_Renderer *renderer)
}
}
void loop()
void loop(void)
{
int i;
SDL_Event event;

View File

@@ -53,7 +53,7 @@ play_through_once(void *arg, Uint8 *stream, int len)
}
}
void loop()
void loop(void)
{
if (SDL_AtomicGet(&cbd[0].done)) {
#ifdef __EMSCRIPTEN__

View File

@@ -32,7 +32,7 @@ static int width = 640;
static int height = 480;
static unsigned int max_frames = 200;
void draw()
void draw(void)
{
SDL_Rect Rect;
@@ -50,7 +50,7 @@ void draw()
SDL_RenderPresent(renderer);
}
void save_surface_to_bmp()
void save_surface_to_bmp(void)
{
SDL_Surface *surface;
Uint32 r_mask, g_mask, b_mask, a_mask;
@@ -71,7 +71,7 @@ void save_surface_to_bmp()
SDL_FreeSurface(surface);
}
void loop()
void loop(void)
{
SDL_Event event;

View File

@@ -178,7 +178,7 @@ PrintUsage(char *argv0)
SDL_Log("\n");
}
void loop()
void loop(void)
{
SDL_Event event;

View File

@@ -35,7 +35,7 @@ DrawRects(SDL_Renderer *renderer)
}
static void
loop()
loop(void)
{
/* Check for events */
while (SDL_PollEvent(&event)) {

View File

@@ -87,7 +87,7 @@ void Draw(DrawState *s)
/* SDL_Delay(10); */
}
void loop()
void loop(void)
{
int i;
SDL_Event event;

View File

@@ -173,7 +173,7 @@ Draw(DrawState *s)
return SDL_TRUE;
}
void loop()
void loop(void)
{
int i;
SDL_Event event;

View File

@@ -78,7 +78,7 @@ void Draw(DrawState *s)
SDL_RenderPresent(s->renderer);
}
void loop()
void loop(void)
{
int i;
SDL_Event event;

View File

@@ -228,7 +228,7 @@ static void DestroyShaderProgram(ShaderData *data)
}
}
static SDL_bool InitShaders()
static SDL_bool InitShaders(void)
{
int i;
@@ -282,7 +282,7 @@ static SDL_bool InitShaders()
return SDL_TRUE;
}
static void QuitShaders()
static void QuitShaders(void)
{
int i;

View File

@@ -392,7 +392,7 @@ void MoveSprites(SDL_Renderer *renderer, SDL_Texture *sprite)
SDL_RenderPresent(renderer);
}
static void MoveAllSprites()
static void MoveAllSprites(void)
{
int i;
@@ -404,7 +404,7 @@ static void MoveAllSprites()
}
}
void loop()
void loop(void)
{
Uint32 now;
SDL_Event event;

View File

@@ -43,7 +43,7 @@ quit(int rc)
exit(rc);
}
void MoveSprites()
void MoveSprites(void)
{
int i;
int window_w = WINDOW_WIDTH;
@@ -77,7 +77,7 @@ void MoveSprites()
SDL_RenderPresent(renderer);
}
void loop()
void loop(void)
{
SDL_Event event;

View File

@@ -94,7 +94,7 @@ void UpdateTexture(SDL_Texture *texture)
SDL_UnlockTexture(texture);
}
void loop()
void loop(void)
{
SDL_Event event;

View File

@@ -95,7 +95,7 @@ void DrawOnViewport(SDL_Renderer *renderer)
SDL_RenderSetClipRect(renderer, NULL);
}
void loop()
void loop(void)
{
SDL_Event event;
int i;

View File

@@ -143,7 +143,7 @@ draw_modes_menu(SDL_Window *window, SDL_Renderer *renderer, SDL_Rect viewport)
}
}
void loop()
void loop(void)
{
int i;
SDL_Event event;