mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Silence some warnings; cleanup

Browse Source
This commit is contained in:
twinaphex 2021-06-21 21:15:03 +02:00
parent 10f42d7034
commit 0e1d5ba30e
6 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cheevos/cheevos.c
View File

@ -151,7 +151,7 @@ static rcheevos_locals_t rcheevos_locals =
false /* leaderboard_trackers */ false /* leaderboard_trackers */
}; };
rcheevos_locals_t* get_rcheevos_locals() rcheevos_locals_t* get_rcheevos_locals(void)
{ {
return &rcheevos_locals; return &rcheevos_locals;
} }

2
cheevos/cheevos_locals.h
View File

@ -151,7 +151,7 @@ typedef struct rcheevos_locals_t
bool leaderboard_trackers; /* leaderboard trackers are enabled */ bool leaderboard_trackers; /* leaderboard trackers are enabled */
} rcheevos_locals_t; } rcheevos_locals_t;
rcheevos_locals_t* get_rcheevos_locals(); rcheevos_locals_t* get_rcheevos_locals(void);
RETRO_END_DECLS RETRO_END_DECLS

8
deps/7zip/CpuArch.c vendored
View File

@ -144,7 +144,7 @@ int x86cpuid_GetFirm(const Cx86cpuid *p)
return -1; return -1;
} }
BoolInt CPU_Is_InOrder() BoolInt CPU_Is_InOrder(void)
{ {
Cx86cpuid p; Cx86cpuid p;
int firm; int firm;
@ -175,7 +175,7 @@ BoolInt CPU_Is_InOrder()
#if !defined(MY_CPU_AMD64) && defined(_WIN32) #if !defined(MY_CPU_AMD64) && defined(_WIN32)
#include <windows.h> #include <windows.h>
static BoolInt CPU_Sys_Is_SSE_Supported() static BoolInt CPU_Sys_Is_SSE_Supported(void)
{ {
OSVERSIONINFO vi; OSVERSIONINFO vi;
vi.dwOSVersionInfoSize = sizeof(vi); vi.dwOSVersionInfoSize = sizeof(vi);
@ -188,7 +188,7 @@ static BoolInt CPU_Sys_Is_SSE_Supported()
#define CHECK_SYS_SSE_SUPPORT #define CHECK_SYS_SSE_SUPPORT
#endif #endif
BoolInt CPU_Is_Aes_Supported() BoolInt CPU_Is_Aes_Supported(void)
{ {
Cx86cpuid p; Cx86cpuid p;
CHECK_SYS_SSE_SUPPORT CHECK_SYS_SSE_SUPPORT
@ -197,7 +197,7 @@ BoolInt CPU_Is_Aes_Supported()
return (p.c >> 25) & 1; return (p.c >> 25) & 1;
} }
BoolInt CPU_IsSupported_PageGB() BoolInt CPU_IsSupported_PageGB(void)
{ {
Cx86cpuid cpuid; Cx86cpuid cpuid;
if (!x86cpuid_CheckAndRead(&cpuid)) if (!x86cpuid_CheckAndRead(&cpuid))

6
deps/7zip/CpuArch.h vendored
View File

@ -325,9 +325,9 @@ int x86cpuid_GetFirm(const Cx86cpuid *p);
#define x86cpuid_GetModel(ver) (((ver >> 12) & 0xF0) | ((ver >> 4) & 0xF)) #define x86cpuid_GetModel(ver) (((ver >> 12) & 0xF0) | ((ver >> 4) & 0xF))
#define x86cpuid_GetStepping(ver) (ver & 0xF) #define x86cpuid_GetStepping(ver) (ver & 0xF)
BoolInt CPU_Is_InOrder(); BoolInt CPU_Is_InOrder(void);
BoolInt CPU_Is_Aes_Supported(); BoolInt CPU_Is_Aes_Supported(void);
BoolInt CPU_IsSupported_PageGB(); BoolInt CPU_IsSupported_PageGB(void);
#endif #endif

2
deps/rcheevos/include/rc_hash.h vendored
View File

@ -120,7 +120,7 @@ extern "C" {
rc_hash_cdreader_absolute_sector_to_track_sector absolute_sector_to_track_sector; rc_hash_cdreader_absolute_sector_to_track_sector absolute_sector_to_track_sector;
}; };
void rc_hash_init_default_cdreader(); void rc_hash_init_default_cdreader(void);
void rc_hash_init_custom_cdreader(struct rc_hash_cdreader* reader); void rc_hash_init_custom_cdreader(struct rc_hash_cdreader* reader);
/* ===================================================== */ /* ===================================================== */

32
retroarch.c
View File

@ -39711,29 +39711,31 @@ bool core_options_create_override(bool game_specific)
{ {
char options_path[PATH_MAX_LENGTH]; char options_path[PATH_MAX_LENGTH];
config_file_t *conf = NULL; config_file_t *conf = NULL;
struct rarch_state *p_rarch = &rarch_st;
options_path[0] = '\0'; options_path[0] = '\0';
/* Sanity check - cannot create a folder-specific if (!game_specific)
* override if a game-specific override is
* already active */
if (!game_specific && runloop_state.game_options_active)
goto error;
/* Get options file path (either game-specific or folder-specific) */
if (game_specific)
{ {
if (!retroarch_validate_game_options( /* Sanity check - cannot create a folder-specific
options_path, * override if a game-specific override is
sizeof(options_path), true)) * already active */
if (runloop_state.game_options_active)
goto error; goto error;
}
else /* Get options file path (folder-specific) */
if (!retroarch_validate_folder_options( if (!retroarch_validate_folder_options(
options_path, options_path,
sizeof(options_path), true)) sizeof(options_path), true))
goto error; goto error;
}
else
{
/* Get options file path (game-specific) */
if (!retroarch_validate_game_options(
options_path,
sizeof(options_path), true))
goto error;
}
/* Open config file */ /* Open config file */
if (!(conf = config_file_new_from_path_to_string(options_path))) if (!(conf = config_file_new_from_path_to_string(options_path)))