From 8c9c9b38450abb99bdd5857501ea163d06a51e03 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Sun, 28 May 2023 23:48:26 +0200
Subject: [PATCH] Localize string and other cleanups

---
 cheat_manager.c         | 21 ++++++++++++---------
 cheat_manager.h         |  2 +-
 menu/menu_displaylist.c |  3 ++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cheat_manager.c b/cheat_manager.c
index 9be65585ae..14967fa9b1 100644
--- a/cheat_manager.c
+++ b/cheat_manager.c
@@ -622,10 +622,13 @@ void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
    if (!handle || !handle->cheats || handle->size == 0)
       return;
 
+   /* TODO/FIXME - localize */
    snprintf(msg, sizeof(msg),
          "Cheat: #%u [%s]: %s",
          handle_idx,
-         handle->cheats[handle_idx].state ? "ON" : "OFF",
+         handle->cheats[handle_idx].state 
+         ? msg_hash_to_str(MENU_ENUM_LABEL_ON) 
+         : msg_hash_to_str(MENU_ENUM_LABEL_OFF),
          handle->cheats[handle_idx].desc 
          ? (handle->cheats[handle_idx].desc) 
          : (handle->cheats[handle_idx].code)
@@ -724,9 +727,9 @@ static bool cheat_manager_get_game_specific_filename(
    core_name = system_info.library_name;
    game_name = path_basename_nocompression(runloop_st->name.cheatfile);
 
-   if (string_is_empty(path_cheat_database) ||
-         string_is_empty(core_name) ||
-         string_is_empty(game_name))
+   if (     string_is_empty(path_cheat_database)
+         || string_is_empty(core_name)
+         || string_is_empty(game_name))
       return false;
 
    fill_pathname_join_special(s1,
@@ -778,13 +781,11 @@ void cheat_manager_state_free(void)
    cheat_manager_free();
 }
 
-bool cheat_manager_alloc_if_empty(void)
+void cheat_manager_alloc_if_empty(void)
 {
    cheat_manager_t *cheat_st = &cheat_manager_state;
    if (!cheat_st->cheats)
       cheat_manager_new(0);
-
-   return true;
 }
 
 int cheat_manager_initialize_memory(rarch_setting_t *setting, size_t idx, bool wraparound)
@@ -1028,9 +1029,11 @@ static int cheat_manager_search(enum cheat_search_type search_type)
    struct menu_state *menu_st  = menu_state_get_ptr();
 #endif
 
-   if (cheat_st->num_memory_buffers == 0 || prev == NULL || cheat_st->matches == NULL)
+   if (cheat_st->num_memory_buffers == 0 || !prev || !cheat_st->matches)
    {
-      runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_NOT_INITIALIZED), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+      runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_NOT_INITIALIZED),
+            1, 180, true, NULL,
+            MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
       return 0;
    }
 
diff --git a/cheat_manager.h b/cheat_manager.h
index 691d7794ba..26195a66d7 100644
--- a/cheat_manager.h
+++ b/cheat_manager.h
@@ -234,7 +234,7 @@ bool cheat_manager_get_code_state(unsigned i);
 
 void cheat_manager_state_free(void);
 
-bool cheat_manager_alloc_if_empty(void);
+void cheat_manager_alloc_if_empty(void);
 
 bool cheat_manager_copy_idx_to_working(unsigned idx);
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index a045e0e55d..1f8ef64ee2 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -7662,7 +7662,8 @@ unsigned menu_displaylist_build_list(
          break;
       case DISPLAYLIST_OPTIONS_CHEATS:
 #ifdef HAVE_CHEATS
-         if (cheat_manager_alloc_if_empty())
+         cheat_manager_alloc_if_empty();
+
          {
             unsigned i;
             size_t _len;