From 596901b3357d47416931ff8976c850a47660c8ff Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 7 Feb 2018 23:38:32 +0100
Subject: [PATCH] Get rid of more hashes

---
 menu/cbs/menu_cbs_ok.c | 53 +++++++++++++++++++++---------------------
 menu/menu_cbs.c        |  2 +-
 menu/menu_cbs.h        |  3 +--
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index a6e46f6704..9b09db9303 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -3844,7 +3844,7 @@ static struct cbs_push_lbl_callback cbs_ok_lbl_list[] = {
 };
 
 static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
-      const char *label, uint32_t hash)
+      const char *label)
 {
    unsigned k;
 
@@ -3890,7 +3890,27 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
       }
    }
 
-   if (cbs->enum_idx != MSG_UNKNOWN)
+   if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES)))
+   {
+      BIND_ACTION_OK(cbs, action_ok_push_content_list);	
+      return 0;
+   }
+   else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_REMAP_FILE_LOAD)))
+   {
+      BIND_ACTION_OK(cbs, action_ok_remap_file);	
+      return 0;
+   }
+   else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE)))
+   {
+      BIND_ACTION_OK(cbs, action_ok_remap_file_save_core);	
+      return 0;
+   }
+   else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME)))
+   {
+      BIND_ACTION_OK(cbs, action_ok_remap_file_save_game);	
+      return 0;
+   }
+   else if (cbs->enum_idx != MSG_UNKNOWN)
    {
       switch (cbs->enum_idx)
       {
@@ -4310,29 +4330,11 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          default:
             return -1;
       }
-   }
-   else
-   {
-      switch (hash)
-      {
-         case MENU_LABEL_FAVORITES:	
-            BIND_ACTION_OK(cbs, action_ok_push_content_list);	
-            break;
-         case MENU_LABEL_REMAP_FILE_LOAD:
-            BIND_ACTION_OK(cbs, action_ok_remap_file);
-            break;
-         case MENU_LABEL_REMAP_FILE_SAVE_CORE:
-            BIND_ACTION_OK(cbs, action_ok_remap_file_save_core);
-            break;
-         case MENU_LABEL_REMAP_FILE_SAVE_GAME:
-            BIND_ACTION_OK(cbs, action_ok_remap_file_save_game);
-            break;
-         default:
-            return -1;
-      }
+
+      return 0;
    }
 
-   return 0;
+   return -1;
 }
 
 static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
@@ -4645,15 +4647,14 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
 
 int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
       const char *path, const char *menu_label,
-      const char *label, unsigned type, size_t idx,
-      uint32_t label_hash)
+      const char *label, unsigned type, size_t idx)
 {
    if (!cbs)
       return -1;
 
    BIND_ACTION_OK(cbs, action_ok_lookup_setting);
 
-   if (menu_cbs_init_bind_ok_compare_label(cbs, label, label_hash) == 0)
+   if (menu_cbs_init_bind_ok_compare_label(cbs, label) == 0)
       return 0;
 
    if (menu_cbs_init_bind_ok_compare_type(cbs, menu_label, type) == 0)
diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c
index 846f01f74d..890cdd7fbf 100644
--- a/menu/menu_cbs.c
+++ b/menu/menu_cbs.c
@@ -236,7 +236,7 @@ void menu_cbs_init(void *data,
    /* It will try to find a corresponding callback function inside
     * menu_cbs_ok.c, then map this callback to the entry. */
    menu_cbs_init_bind_ok(cbs, path, menu_label,
-         label, type, idx, label_hash);
+         label, type, idx);
 
    menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident);
 
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 4722b06fc3..11065bbfd9 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -214,8 +214,7 @@ int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
 
 int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
       const char *path, const char *menu_label,
-      const char *label, unsigned type, size_t idx,
-      uint32_t label_hash);
+      const char *label, unsigned type, size_t idx);
 
 int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx);