From 0536439129ea4a3dfe46cde83764ed6d252e84c6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 31 Jul 2016 14:40:59 +0200 Subject: [PATCH] Create static variable for path_libretro and move it outside of settings struct --- configuration.c | 24 ++++++++---------------- configuration.h | 1 - 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/configuration.c b/configuration.c index 575cf50ec0..e5596f42b8 100644 --- a/configuration.c +++ b/configuration.c @@ -3269,44 +3269,36 @@ bool config_replace(char *path) return true; } +static char path_libretro[PATH_MAX_LENGTH]; + char *config_get_active_core_path_ptr(void) { - settings_t *settings = config_get_ptr(); - return settings->path.libretro; + return path_libretro; } const char *config_get_active_core_path(void) { - const char *core_path = (const char *)config_get_active_core_path_ptr(); - return core_path; + return path_libretro; } bool config_active_core_path_is_empty(void) { - settings_t *settings = config_get_ptr(); - return !settings->path.libretro[0]; + return !path_libretro[0]; } size_t config_get_active_core_path_size(void) { - settings_t *settings = config_get_ptr(); - return sizeof(settings->path.libretro); + return sizeof(path_libretro); } void config_set_active_core_path(const char *path) { - settings_t *settings = config_get_ptr(); - if (!settings) - return; - strlcpy(settings->path.libretro, path, sizeof(settings->path.libretro)); + strlcpy(path_libretro, path, sizeof(path_libretro)); } void config_clear_active_core_path(void) { - settings_t *settings = config_get_ptr(); - if (!settings) - return; - *settings->path.libretro = '\0'; + *path_libretro = '\0'; } const char *config_get_active_path(void) diff --git a/configuration.h b/configuration.h index 18c0e90be2..dd7a9b7b18 100644 --- a/configuration.h +++ b/configuration.h @@ -385,7 +385,6 @@ typedef struct settings { char cheat_database[PATH_MAX_LENGTH]; char content_database[PATH_MAX_LENGTH]; - char libretro[PATH_MAX_LENGTH]; char osk_overlay[PATH_MAX_LENGTH]; char overlay[PATH_MAX_LENGTH]; char menu_wallpaper[PATH_MAX_LENGTH];