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

Revert "Create dir_clear"

Browse Source 
This reverts commit d7d49c36c76eabc093a24f2ecbb149d04ae3bd5c.
This commit is contained in:
twinaphex 2016-10-01 08:16:58 +02:00
parent 8409d81e8e
commit c28de7d3ff
3 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configuration.c
View File

@ -1142,10 +1142,10 @@ static void config_set_defaults(void)
/* Make sure settings from other configs carry over into defaults /* Make sure settings from other configs carry over into defaults
* for another config. */ * for another config. */
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL)) if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH))
dir_clear(RARCH_DIR_SAVEFILE); dir_clear_savefile();
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL)) if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH))
dir_clear(RARCH_DIR_SAVESTATE); dir_clear_savestate();
*settings->path.libretro_info = '\0'; *settings->path.libretro_info = '\0';
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL)) if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL))
@ -2098,7 +2098,7 @@ static bool config_load_file(const char *path, bool set_defaults,
if (string_is_equal(settings->directory.overlay, "default")) if (string_is_equal(settings->directory.overlay, "default"))
*settings->directory.overlay = '\0'; *settings->directory.overlay = '\0';
if (string_is_equal(dir_get_osk_overlay(), "default")) if (string_is_equal(dir_get_osk_overlay(), "default"))
dir_clear(RARCH_DIR_OSK_OVERLAY); dir_clear_osk_overlay();
#endif #endif
if (string_is_equal(settings->directory.system, "default")) if (string_is_equal(settings->directory.system, "default"))
*settings->directory.system = '\0'; *settings->directory.system = '\0';

44
dirs.c
View File

@ -212,34 +212,32 @@ size_t dir_get_osk_overlay_size(void)
/* clear functions */ /* clear functions */
void dir_clear(enum rarch_dir_type type) void dir_clear_system(void)
{ {
switch (type) *dir_system = '\0';
{ }
case RARCH_DIR_SYSTEM:
*dir_system = '\0'; void dir_clear_savefile(void)
break; {
case RARCH_DIR_SAVEFILE: *dir_savefile = '\0';
*dir_savefile = '\0'; }
break;
case RARCH_DIR_SAVESTATE: void dir_clear_savestate(void)
*dir_savestate = '\0'; {
break; *dir_savestate = '\0';
case RARCH_DIR_OSK_OVERLAY: }
*dir_osk_overlay = '\0';
break; void dir_clear_osk_overlay(void)
case RARCH_DIR_NONE: {
default: *dir_osk_overlay = '\0';
break;
}
} }
void dir_clear_all(void) void dir_clear_all(void)
{ {
dir_clear(RARCH_DIR_SYSTEM); dir_clear_system();
dir_clear(RARCH_DIR_OSK_OVERLAY); dir_clear_osk_overlay();
dir_clear(RARCH_DIR_SAVEFILE); dir_clear_savefile();
dir_clear(RARCH_DIR_SAVESTATE); dir_clear_savestate();
} }
/* get ptr functions */ /* get ptr functions */

17
dirs.h
View File

@ -21,15 +21,6 @@
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
enum rarch_dir_type
{
RARCH_DIR_NONE = 0,
RARCH_DIR_SYSTEM,
RARCH_DIR_SAVEFILE,
RARCH_DIR_SAVESTATE,
RARCH_DIR_OSK_OVERLAY
};
/* init functions */ /* init functions */
bool dir_init_shader(void); bool dir_init_shader(void);
@ -54,7 +45,13 @@ bool dir_is_osk_overlay_empty(void);
/* clear functions */ /* clear functions */
void dir_clear(enum rarch_dir_type type); void dir_clear_system(void);
void dir_clear_savefile(void);
void dir_clear_savestate(void);
void dir_clear_osk_overlay(void);
void dir_clear_all(void); void dir_clear_all(void);