From b46a316df90cd90a38ee16e6c829da27a33116ee Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 13 Jun 2020 07:29:26 +0200
Subject: [PATCH] (core info) Pass pointer around to some functions

---
 core_info.c | 8 ++++----
 core_info.h | 6 ++++--
 retroarch.c | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core_info.c b/core_info.c
index b965759164..99390d0e7a 100644
--- a/core_info.c
+++ b/core_info.c
@@ -692,9 +692,8 @@ static bool core_info_list_update_missing_firmware_internal(
    return true;
 }
 
-void core_info_free_current_core(void)
+void core_info_free_current_core(core_info_state_t *p_coreinfo)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
    if (p_coreinfo->current)
       free(p_coreinfo->current);
    p_coreinfo->current = NULL;
@@ -760,10 +759,11 @@ bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
          set_missing_bios);
 }
 
-bool core_info_load(core_info_ctx_find_t *info)
+bool core_info_load(
+      core_info_ctx_find_t *info,
+      core_info_state_t *p_coreinfo)
 {
    core_info_t    *core_info     = NULL;
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
 
    if (!info)
       return false;
diff --git a/core_info.h b/core_info.h
index 757912d0a8..e4b81b0e13 100644
--- a/core_info.h
+++ b/core_info.h
@@ -166,7 +166,7 @@ void core_info_get_name(const char *path, char *s, size_t len,
 
 core_info_t *core_info_get(core_info_list_t *list, size_t i);
 
-void core_info_free_current_core(void);
+void core_info_free_current_core(core_info_state_t *p_coreinfo);
 
 bool core_info_init_current_core(void);
 
@@ -184,7 +184,9 @@ bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
 
 bool core_info_find(core_info_ctx_find_t *info);
 
-bool core_info_load(core_info_ctx_find_t *info);
+bool core_info_load(
+      core_info_ctx_find_t *info,
+      core_info_state_t *p_coreinfo);
 
 bool core_info_database_supports_content_path(const char *database_path, const char *path);
 
diff --git a/retroarch.c b/retroarch.c
index 9a7a6e11b6..1facf66b05 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -14328,7 +14328,7 @@ bool command_event(enum event_command cmd, void *data)
                return false;
             info_find.path = core_path;
 
-            if (!core_info_load(&info_find))
+            if (!core_info_load(&info_find, &p_rarch->core_info_st))
             {
 #ifdef HAVE_DYNAMIC
                return false;
@@ -14789,7 +14789,7 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_CORE_INFO_DEINIT:
          core_info_deinit_list();
-         core_info_free_current_core();
+         core_info_free_current_core(&p_rarch->core_info_st);
          break;
       case CMD_EVENT_CORE_INFO_INIT:
          {
@@ -32590,7 +32590,7 @@ static void drivers_init(struct rarch_state *p_rarch, int flags)
 static void driver_uninit(struct rarch_state *p_rarch, int flags)
 {
    core_info_deinit_list();
-   core_info_free_current_core();
+   core_info_free_current_core(&p_rarch->core_info_st);
 
 #if defined(HAVE_GFX_WIDGETS)
    /* This absolutely has to be done before video_driver_free_internal()