libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-20 09:34:09 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Rename rarch_ functions

Browse Source
This commit is contained in:
twinaphex 2016-05-09 07:09:26 +02:00
parent 3b344257d7
commit f8a7154557
15 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/audio_driver.c
View File

@ -355,7 +355,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
current_audio))
{
RARCH_ERR("Cannot open threaded audio driver ... Exiting ...\n");
retro_fail(1, "audio_driver_init_internal()");
retroarch_fail(1, "audio_driver_init_internal()");
}
}
else
@ -775,7 +775,7 @@ bool audio_driver_find_driver(void)
current_audio = (const audio_driver_t*)audio_driver_find_handle(0);
if (!current_audio)
retro_fail(1, "audio_driver_find()");
retroarch_fail(1, "audio_driver_find()");
}
return true;

2
camera/camera_driver.c
View File

@ -153,7 +153,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
if (!camera_driver)
retro_fail(1, "find_camera_driver()");
retroarch_fail(1, "find_camera_driver()");
}
}
break;

3
content.c
View File

@ -855,7 +855,8 @@ static void content_load_init_wrap(
* If no content file can be loaded, will start up RetroArch
* as-is.
*
* Returns: false (0) if rarch_main_init failed, otherwise true (1).
* Returns: false (0) if retroarch_main_init failed,
* otherwise true (1).
**/
bool content_load(content_ctx_info_t *info)
{

10
dynamic.c
View File

@ -54,7 +54,7 @@
#define SYMBOL(x) do { \
function_t func = dylib_proc(lib_handle, #x); \
memcpy(&current_core->x, &func, sizeof(func)); \
if (current_core->x == NULL) { RARCH_ERR("Failed to load symbol: \"%s\"\n", #x); retro_fail(1, "init_libretro_sym()"); } \
if (current_core->x == NULL) { RARCH_ERR("Failed to load symbol: \"%s\"\n", #x); retroarch_fail(1, "init_libretro_sym()"); } \
} while (0)
static dylib_t lib_handle;
@ -307,14 +307,14 @@ static void load_dynamic_core(void)
RARCH_ERR("This could happen if other modules RetroArch depends on "
"link against libretro directly.\n");
RARCH_ERR("Proceeding could cause a crash. Aborting ...\n");
retro_fail(1, "init_libretro_sym()");
retroarch_fail(1, "init_libretro_sym()");
}
if (!*settings->path.libretro)
{
RARCH_ERR("RetroArch is built for dynamic libretro cores, but "
"libretro_path is not set. Cannot continue.\n");
retro_fail(1, "init_libretro_sym()");
retroarch_fail(1, "init_libretro_sym()");
}
/* Need to use absolute path for this setting. It can be
@ -330,7 +330,7 @@ static void load_dynamic_core(void)
RARCH_ERR("Failed to open libretro core: \"%s\"\n",
settings->path.libretro);
RARCH_ERR("Error(s): %s\n", dylib_error());
retro_fail(1, "load_dynamic()");
retroarch_fail(1, "load_dynamic()");
}
}
#endif
@ -740,7 +740,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
break;
case RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY:
*(const char**)data = rarch_get_current_savefile_dir();
*(const char**)data = retroarch_get_current_savefile_dir();
break;
case RETRO_ENVIRONMENT_GET_USERNAME:

6
gfx/video_driver.c
View File

@ -446,7 +446,7 @@ static void init_video_input(const input_driver_t *tmp)
error:
RARCH_ERR("Cannot initialize input driver. Exiting ...\n");
retro_fail(1, "init_video_input()");
retroarch_fail(1, "init_video_input()");
}
/**
@ -754,7 +754,7 @@ static bool init_video(void)
return true;
error:
retro_fail(1, "init_video()");
retroarch_fail(1, "init_video()");
return false;
}
@ -1629,7 +1629,7 @@ bool video_driver_find_driver(void)
current_video = (video_driver_t*)video_driver_find_handle(0);
if (!current_video)
retro_fail(1, "find_video_driver()");
retroarch_fail(1, "find_video_driver()");
}
return true;
}

2
input/input_driver.c
View File

@ -738,7 +738,7 @@ bool input_driver_find_driver(void)
if (current_input)
return true;
retro_fail(1, "find_input_driver()");
retroarch_fail(1, "find_input_driver()");
return false;
}

2
location/location_driver.c
View File

@ -114,7 +114,7 @@ void find_location_driver(void)
location_driver = (const location_driver_t*)location_driver_find_handle(0);
if (!location_driver)
retro_fail(1, "find_location_driver()");
retroarch_fail(1, "find_location_driver()");
}
}

2
menu/cbs/menu_cbs_ok.c
View File

@ -1602,7 +1602,7 @@ static int action_ok_option_create(const char *path,
char game_path[PATH_MAX_LENGTH];
config_file_t *conf = NULL;
if (!rarch_game_options_validate(game_path, sizeof(game_path), true))
if (!retroarch_validate_game_options(game_path, sizeof(game_path), true))
{
runloop_msg_queue_push("Error saving core options file",
1, 100, true);

6
menu/menu_displaylist.c
View File

@ -624,7 +624,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
#endif
rarch_info_get_capabilities(RARCH_CAPABILITIES_COMPILER, tmp, sizeof(tmp));
retroarch_get_capabilities(RARCH_CAPABILITIES_COMPILER, tmp, sizeof(tmp));
menu_entries_add(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
#ifdef ANDROID
@ -644,7 +644,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
sizeof(cpu_str));
strlcat(cpu_str, ": ", sizeof(cpu_str));
rarch_info_get_capabilities(RARCH_CAPABILITIES_CPU,
retroarch_get_capabilities(RARCH_CAPABILITIES_CPU,
cpu_str, sizeof(cpu_str));
menu_entries_add(info->list, cpu_str, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
@ -2767,7 +2767,7 @@ static int menu_displaylist_parse_generic(
if (settings->multimedia.builtin_mediaplayer_enable ||
settings->multimedia.builtin_imageviewer_enable)
{
switch (rarch_path_is_media_type(path))
switch (retroarch_path_is_media_type(path))
{
case RARCH_CONTENT_MOVIE:
#ifdef HAVE_FFMPEG

6
menu/menu_driver.c
View File

@ -391,7 +391,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
if (!menu_driver_ctx)
{
retro_fail(1, "find_menu_driver()");
retroarch_fail(1, "find_menu_driver()");
return false;
}
}
@ -583,7 +583,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
if (!menu_driver_data || !menu_init(menu_driver_data))
{
retro_fail(1, "init_menu()");
retroarch_fail(1, "init_menu()");
return false;
}
@ -594,7 +594,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
{
if (!menu_driver_ctx->lists_init(menu_driver_data))
{
retro_fail(1, "init_menu()");
retroarch_fail(1, "init_menu()");
return false;
}
}

2
movie.c
View File

@ -310,7 +310,7 @@ static void bsv_movie_init_state(void)
RARCH_ERR("%s: \"%s\".\n",
msg_hash_to_str(MSG_FAILED_TO_LOAD_MOVIE_FILE),
bsv_movie_state.movie_start_path);
retro_fail(1, "event_init_movie()");
retroarch_fail(1, "event_init_movie()");
}
bsv_movie_state.movie_playback = true;

2
record/record_driver.c
View File

@ -116,7 +116,7 @@ void find_record_driver(void)
recording_driver = (const record_driver_t*)record_driver_find_handle(0);
if (!recording_driver)
retro_fail(1, "find_record_driver()");
retroarch_fail(1, "find_record_driver()");
}
}

77
retroarch.c
View File

@ -168,7 +168,7 @@ static void print_features(void)
}
#undef _PSUPP
static void print_version(void)
static void retroarch_print_version(void)
{
char str[PATH_MAX_LENGTH] = {0};
@ -177,20 +177,20 @@ static void print_version(void)
#ifdef HAVE_GIT_VERSION
printf(" -- %s --\n", rarch_git_version);
#endif
rarch_info_get_capabilities(RARCH_CAPABILITIES_COMPILER, str, sizeof(str));
retroarch_get_capabilities(RARCH_CAPABILITIES_COMPILER, str, sizeof(str));
fprintf(stdout, "%s", str);
fprintf(stdout, "Built: %s\n", __DATE__);
}
/**
* print_help:
* retroarch_print_help:
*
* Prints help message explaining the program's commandline switches.
**/
static void print_help(const char *arg0)
static void retroarch_print_help(const char *arg0)
{
puts("===================================================================");
print_version();
retroarch_print_version();
puts("===================================================================");
printf("Usage: %s [OPTIONS]... [FILE]\n", arg0);
@ -386,7 +386,7 @@ static void set_special_paths(char **argv, unsigned num_content)
RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",argv[0]);
}
const char *rarch_get_current_savefile_dir(void)
const char *retroarch_get_current_savefile_dir(void)
{
global_t *global = global_get_ptr();
@ -533,7 +533,7 @@ static void set_paths_redirect(const char *path)
enum rarch_content_type rarch_path_is_media_type(const char *path)
enum rarch_content_type retroarch_path_is_media_type(const char *path)
{
uint32_t hash_ext = msg_hash_calculate(path_get_extension(path));
@ -724,7 +724,7 @@ static void parse_input(int argc, char *argv[])
switch (c)
{
case 'h':
print_help(argv[0]);
retroarch_print_help(argv[0]);
exit(0);
case 'd':
@ -744,8 +744,8 @@ static void parse_input(int argc, char *argv[])
if (port < 1 || port > MAX_USERS)
{
RARCH_ERR("Connect device to a valid port.\n");
print_help(argv[0]);
retro_fail(1, "parse_input()");
retroarch_print_help(argv[0]);
retroarch_fail(1, "parse_input()");
}
settings->input.libretro_device[port - 1] = id;
global->has_set.libretro_device[port - 1] = true;
@ -757,8 +757,8 @@ static void parse_input(int argc, char *argv[])
if (port < 1 || port > MAX_USERS)
{
RARCH_ERR("Connect dualanalog to a valid port.\n");
print_help(argv[0]);
retro_fail(1, "parse_input()");
retroarch_print_help(argv[0]);
retroarch_fail(1, "parse_input()");
}
settings->input.libretro_device[port - 1] = RETRO_DEVICE_ANALOG;
global->has_set.libretro_device[port - 1] = true;
@ -794,8 +794,8 @@ static void parse_input(int argc, char *argv[])
if (port < 1 || port > MAX_USERS)
{
RARCH_ERR("Disconnect device from a valid port.\n");
print_help(argv[0]);
retro_fail(1, "parse_input()");
retroarch_print_help(argv[0]);
retroarch_fail(1, "parse_input()");
}
settings->input.libretro_device[port - 1] = RETRO_DEVICE_NONE;
global->has_set.libretro_device[port - 1] = true;
@ -874,8 +874,8 @@ static void parse_input(int argc, char *argv[])
else if (!string_is_equal(optarg, "load-save"))
{
RARCH_ERR("Invalid argument in --sram-mode.\n");
print_help(argv[0]);
retro_fail(1, "parse_input()");
retroarch_print_help(argv[0]);
retroarch_fail(1, "parse_input()");
}
break;
@ -957,7 +957,7 @@ static void parse_input(int argc, char *argv[])
if (rarch_cmd_send((const char*)optarg))
exit(0);
else
retro_fail(1, "network_cmd_send()");
retroarch_fail(1, "network_cmd_send()");
break;
#endif
@ -972,8 +972,8 @@ static void parse_input(int argc, char *argv[])
&global->record.height) != 2)
{
RARCH_ERR("Wrong format for --size.\n");
print_help(argv[0]);
retro_fail(1, "parse_input()");
retroarch_print_help(argv[0]);
retroarch_fail(1, "parse_input()");
}
break;
}
@ -1003,7 +1003,7 @@ static void parse_input(int argc, char *argv[])
break;
case RA_OPT_VERSION:
print_version();
retroarch_print_version();
exit(0);
#ifdef HAVE_FILE_LOGGER
@ -1013,12 +1013,12 @@ static void parse_input(int argc, char *argv[])
#endif
case '?':
print_help(argv[0]);
retro_fail(1, "parse_input()");
retroarch_print_help(argv[0]);
retroarch_fail(1, "parse_input()");
default:
RARCH_ERR("Error parsing arguments.\n");
retro_fail(1, "parse_input()");
retroarch_fail(1, "parse_input()");
}
}
@ -1027,7 +1027,7 @@ static void parse_input(int argc, char *argv[])
if (optind < argc)
{
RARCH_ERR("--menu was used, but content file was passed as well.\n");
retro_fail(1, "parse_input()");
retroarch_fail(1, "parse_input()");
}
else
{
@ -1155,7 +1155,7 @@ static void rarch_init_savefile_paths(void)
}
}
static bool init_state(void)
static bool retroarch_init_state(void)
{
video_driver_set_active();
audio_driver_set_active();
@ -1165,7 +1165,7 @@ static bool init_state(void)
return true;
}
bool rarch_game_options_validate(char *s, size_t len, bool mkdir)
bool retroarch_validate_game_options(char *s, size_t len, bool mkdir)
{
char core_path[PATH_MAX_LENGTH];
char config_directory[PATH_MAX_LENGTH];
@ -1213,7 +1213,7 @@ bool rarch_game_options_validate(char *s, size_t len, bool mkdir)
}
/**
* rarch_main_init:
* retroarch_main_init:
* @argc : Count of (commandline) arguments.
* @argv : (Commandline) arguments.
*
@ -1221,12 +1221,12 @@ bool rarch_game_options_validate(char *s, size_t len, bool mkdir)
*
* Returns: 0 on success, otherwise 1 if there was an error.
**/
static int rarch_main_init(int argc, char *argv[])
static int retroarch_main_init(int argc, char *argv[])
{
int sjlj_ret;
bool *verbosity = NULL;
init_state();
retroarch_init_state();
if ((sjlj_ret = setjmp(error_sjlj_context)) > 0)
{
@ -1245,7 +1245,7 @@ static int rarch_main_init(int argc, char *argv[])
char str[PATH_MAX_LENGTH] = {0};
RARCH_LOG_OUTPUT("=== Build =======================================");
rarch_info_get_capabilities(RARCH_CAPABILITIES_CPU, str, sizeof(str));
retroarch_get_capabilities(RARCH_CAPABILITIES_CPU, str, sizeof(str));
fprintf(stderr, "%s", str);
fprintf(stderr, "Built: %s\n", __DATE__);
RARCH_LOG_OUTPUT("Version: %s\n", PACKAGE_VERSION);
@ -1273,7 +1273,7 @@ static int rarch_main_init(int argc, char *argv[])
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
switch (rarch_path_is_media_type(fullpath))
switch (retroarch_path_is_media_type(fullpath))
{
case RARCH_CONTENT_MOVIE:
case RARCH_CONTENT_MUSIC:
@ -1326,7 +1326,7 @@ error:
#define FAIL_CPU(simd_type) do { \
RARCH_ERR(simd_type " code is compiled in, but CPU does not support this feature. Cannot continue.\n"); \
retro_fail(1, "validate_cpu_features()"); \
retroarch_fail(1, "validate_cpu_features()"); \
} while(0)
bool rarch_ctl(enum rarch_ctl_state state, void *data)
@ -1434,13 +1434,13 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
case RARCH_CTL_MAIN_INIT:
{
struct rarch_main_wrap *wrap = (struct rarch_main_wrap*)data;
if (rarch_main_init(wrap->argc, wrap->argv))
if (retroarch_main_init(wrap->argc, wrap->argv))
return false;
}
break;
case RARCH_CTL_INIT:
rarch_ctl(RARCH_CTL_DEINIT, NULL);
init_state();
retroarch_init_state();
{
unsigned i;
for (i = 0; i < MAX_USERS; i++)
@ -1589,8 +1589,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
return true;
}
int rarch_info_get_capabilities(enum rarch_capabilities type,
int retroarch_get_capabilities(enum rarch_capabilities type,
char *s, size_t len)
{
switch (type)
@ -1665,15 +1664,15 @@ int rarch_info_get_capabilities(enum rarch_capabilities type,
}
/**
* retro_fail:
* retroarch_fail:
* @error_code : Error code.
* @error : Error message to show.
*
* Sanely kills the program.
**/
void retro_fail(int error_code, const char *error)
void retroarch_fail(int error_code, const char *error)
{
/* We cannot longjmp unless we're in rarch_main_init().
/* We cannot longjmp unless we're in retroarch_main_init().
* If not, something went very wrong, and we should
* just exit right away. */
retro_assert(rarch_ctl(RARCH_CTL_IS_ERROR_ON_INIT, NULL));

12
retroarch.h
View File

@ -170,23 +170,23 @@ struct rarch_main_wrap
bool rarch_ctl(enum rarch_ctl_state state, void *data);
int rarch_info_get_capabilities(enum rarch_capabilities type,
int retroarch_get_capabilities(enum rarch_capabilities type,
char *s, size_t len);
enum rarch_content_type rarch_path_is_media_type(const char *path);
enum rarch_content_type retroarch_path_is_media_type(const char *path);
const char *rarch_get_current_savefile_dir(void);
const char *retroarch_get_current_savefile_dir(void);
bool rarch_game_options_validate(char *s, size_t len, bool mkdir);
bool retroarch_validate_game_options(char *s, size_t len, bool mkdir);
/**
* retro_fail:
* retroarch_fail:
* @error_code : Error code.
* @error : Error message to show.
*
* Sanely kills the program.
**/
void retro_fail(int error_code, const char *error);
void retroarch_fail(int error_code, const char *error);
#ifdef __cplusplus
}

2
runloop.c
View File

@ -493,7 +493,7 @@ static bool rarch_game_specific_options(char **output)
char game_path[PATH_MAX_LENGTH];
config_file_t *option_file = NULL;
if (!rarch_game_options_validate(game_path, sizeof(game_path), false))
if (!retroarch_validate_game_options(game_path, sizeof(game_path), false))
return false;
option_file = config_file_new(game_path);