Skip to content

Commit

Permalink
Rename rarch_ functions
Browse files Browse the repository at this point in the history
  • Loading branch information
inactive123 committed May 9, 2016
1 parent 3b34425 commit f8a7154
Show file tree
Hide file tree
Showing 15 changed files with 69 additions and 69 deletions.
4 changes: 2 additions & 2 deletions audio/audio_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion camera/camera_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion content.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
10 changes: 5 additions & 5 deletions dynamic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions gfx/video_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()");
}

/**
Expand Down Expand Up @@ -754,7 +754,7 @@ static bool init_video(void)
return true;

error:
retro_fail(1, "init_video()");
retroarch_fail(1, "init_video()");
return false;
}

Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion input/input_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion location/location_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()");
}
}

Expand Down
2 changes: 1 addition & 1 deletion menu/cbs/menu_cbs_ok.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions menu/menu_displaylist.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions menu/menu_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion movie.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion record/record_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()");
}
}

Expand Down
Loading

0 comments on commit f8a7154

Please sign in to comment.