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

Turn path_set_names into static function

Browse Source
This commit is contained in:
twinaphex 2016-09-30 04:19:42 +02:00
parent 5d717427c1
commit 1cf45d785f
4 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command.c
View File

@ -987,7 +987,7 @@ static bool command_event_disk_control_append_image(const char *path)
* If we actually use append_image, we assume that we
* started out in a single disk case, and that this way
* of doing it makes the most sense. */
path_set_names(path);
path_set(RARCH_PATH_NAMES, path);
path_fill_names();
}

48
paths.c
View File

@ -423,28 +423,6 @@ static void path_init_savefile_internal(void)
path_init_savefile_rtc();
}
void path_set_names(const char *path)
{
global_t *global = global_get_ptr();
path_set_basename(path);
if (global)
{
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH))
fill_pathname_noext(global->name.savefile, path_main_basename,
file_path_str(FILE_PATH_SRM_EXTENSION), sizeof(global->name.savefile));
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH))
fill_pathname_noext(global->name.savestate, path_main_basename,
file_path_str(FILE_PATH_STATE_EXTENSION), sizeof(global->name.savestate));
fill_pathname_noext(global->name.cheatfile, path_main_basename,
file_path_str(FILE_PATH_CHT_EXTENSION), sizeof(global->name.cheatfile));
}
path_set_redirect();
}
void path_fill_names(void)
{
@ -524,6 +502,29 @@ size_t path_get_core_size(void)
return sizeof(path_libretro);
}
static void path_set_names(const char *path)
{
global_t *global = global_get_ptr();
path_set_basename(path);
if (global)
{
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH))
fill_pathname_noext(global->name.savefile, path_main_basename,
file_path_str(FILE_PATH_SRM_EXTENSION), sizeof(global->name.savefile));
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH))
fill_pathname_noext(global->name.savestate, path_main_basename,
file_path_str(FILE_PATH_STATE_EXTENSION), sizeof(global->name.savestate));
fill_pathname_noext(global->name.cheatfile, path_main_basename,
file_path_str(FILE_PATH_CHT_EXTENSION), sizeof(global->name.cheatfile));
}
path_set_redirect();
}
bool path_set(enum rarch_path_type type, const char *path)
{
if (!path)
@ -531,6 +532,9 @@ bool path_set(enum rarch_path_type type, const char *path)
switch (type)
{
case RARCH_PATH_NAMES:
path_set_names(path);
break;
case RARCH_PATH_CORE:
strlcpy(path_libretro, path,
sizeof(path_libretro));

3
paths.h
View File

@ -35,6 +35,7 @@ enum rarch_path_type
{
RARCH_PATH_NONE = 0,
RARCH_PATH_CORE,
RARCH_PATH_NAMES,
RARCH_PATH_CONFIG,
RARCH_PATH_CONTENT,
RARCH_PATH_CONFIG_APPEND,
@ -61,8 +62,6 @@ bool path_set(enum rarch_path_type type, const char *path);
void path_set_redirect(void);
void path_set_names(const char *path);
void path_set_special(char **argv, unsigned num_content);
void path_set_basename(const char *path);

2
retroarch.c
View File

@ -843,7 +843,7 @@ static void retroarch_parse_input(int argc, char *argv[])
{
/* We requested explicit ROM, so use PLAIN core type. */
retroarch_set_current_core_type(CORE_TYPE_PLAIN, false);
path_set_names((const char*)argv[optind]);
path_set(RARCH_PATH_NAMES, (const char*)argv[optind]);
}
else if (!path_is_subsystem_empty() && optind < argc)
{