From 4ea493c86cf0bfde620b66966052524b93638880 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 17 Sep 2019 01:20:30 +0200
Subject: [PATCH] Turn cheat_manager_free into static function

---
 managers/cheat_manager.c | 89 ++++++++++++++++++++--------------------
 managers/cheat_manager.h |  2 -
 menu/cbs/menu_cbs_ok.c   |  5 +--
 3 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index 583b0f2c5b..211f2066f7 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -270,6 +270,51 @@ bool cheat_manager_copy_working_to_idx(unsigned idx)
    return true;
 }
 
+static void cheat_manager_free(void)
+{
+   unsigned i = 0;
+
+   if (cheat_manager_state.cheats)
+   {
+      for (i = 0; i < cheat_manager_state.size; i++)
+      {
+         if (cheat_manager_state.cheats[i].desc)
+            free(cheat_manager_state.cheats[i].desc);
+         if (cheat_manager_state.cheats[i].code)
+            free(cheat_manager_state.cheats[i].code);
+      }
+
+      free(cheat_manager_state.cheats);
+   }
+
+   if (cheat_manager_state.prev_memory_buf)
+      free(cheat_manager_state.prev_memory_buf);
+
+   if (cheat_manager_state.matches)
+      free(cheat_manager_state.matches);
+
+   if (cheat_manager_state.memory_buf_list)
+      free(cheat_manager_state.memory_buf_list);
+
+   if (cheat_manager_state.memory_size_list)
+      free(cheat_manager_state.memory_size_list);
+
+   cheat_manager_state.cheats = NULL;
+   cheat_manager_state.size = 0;
+   cheat_manager_state.buf_size = 0;
+   cheat_manager_state.prev_memory_buf = NULL;
+   cheat_manager_state.curr_memory_buf = NULL;
+   cheat_manager_state.memory_buf_list = NULL;
+   cheat_manager_state.memory_size_list = NULL;
+   cheat_manager_state.matches = NULL;
+   cheat_manager_state.num_memory_buffers = 0;
+   cheat_manager_state.total_memory_size = 0;
+   cheat_manager_state.memory_initialized = false;
+   cheat_manager_state.memory_search_initialized = false;
+
+}
+
+
 static void cheat_manager_new(unsigned size)
 {
    unsigned i;
@@ -518,50 +563,6 @@ bool cheat_manager_realloc(unsigned new_size, unsigned default_handler)
    return true;
 }
 
-void cheat_manager_free(void)
-{
-   unsigned i = 0;
-
-   if (cheat_manager_state.cheats)
-   {
-      for (i = 0; i < cheat_manager_state.size; i++)
-      {
-         if (cheat_manager_state.cheats[i].desc)
-            free(cheat_manager_state.cheats[i].desc);
-         if (cheat_manager_state.cheats[i].code)
-            free(cheat_manager_state.cheats[i].code);
-      }
-
-      free(cheat_manager_state.cheats);
-   }
-
-   if (cheat_manager_state.prev_memory_buf)
-      free(cheat_manager_state.prev_memory_buf);
-
-   if (cheat_manager_state.matches)
-      free(cheat_manager_state.matches);
-
-   if (cheat_manager_state.memory_buf_list)
-      free(cheat_manager_state.memory_buf_list);
-
-   if (cheat_manager_state.memory_size_list)
-      free(cheat_manager_state.memory_size_list);
-
-   cheat_manager_state.cheats = NULL;
-   cheat_manager_state.size = 0;
-   cheat_manager_state.buf_size = 0;
-   cheat_manager_state.prev_memory_buf = NULL;
-   cheat_manager_state.curr_memory_buf = NULL;
-   cheat_manager_state.memory_buf_list = NULL;
-   cheat_manager_state.memory_size_list = NULL;
-   cheat_manager_state.matches = NULL;
-   cheat_manager_state.num_memory_buffers = 0;
-   cheat_manager_state.total_memory_size = 0;
-   cheat_manager_state.memory_initialized = false;
-   cheat_manager_state.memory_search_initialized = false;
-
-}
-
 void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
 {
    char msg[256];
diff --git a/managers/cheat_manager.h b/managers/cheat_manager.h
index f2f08cd895..c3bc5269bd 100644
--- a/managers/cheat_manager.h
+++ b/managers/cheat_manager.h
@@ -207,8 +207,6 @@ bool cheat_manager_realloc(unsigned new_size, unsigned default_handler);
 
 void cheat_manager_set_code(unsigned index, const char *str);
 
-void cheat_manager_free(void);
-
 void cheat_manager_index_next(void);
 
 void cheat_manager_index_prev(void);
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 7ae422f19c..887482a1a8 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1659,16 +1659,13 @@ static int generic_action_ok(const char *path,
          break;
       case ACTION_OK_LOAD_CHEAT_FILE:
          flush_char = msg_hash_to_str(flush_id);
-         cheat_manager_free();
+         cheat_manager_state_free();
 
          if (!cheat_manager_load(action_path,false))
             goto error;
          break;
       case ACTION_OK_LOAD_CHEAT_FILE_APPEND:
          flush_char = msg_hash_to_str(flush_id);
-#if 0
-         cheat_manager_free();
-#endif
 
          if (!cheat_manager_load(action_path,true))
             goto error;