From 121675c8e4cecf3c40f314e7608cc60eb5db3929 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 15 Sep 2016 21:08:54 +0200
Subject: [PATCH] Cleanups

---
 menu/cbs/menu_cbs_ok.c | 14 +++++++++++++
 menu/menu_input.c      | 47 ------------------------------------------
 menu/menu_input.h      |  6 ------
 setting_list.c         | 33 +++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 49926c8776..cbc3e08d21 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1465,6 +1465,20 @@ static int action_ok_cheevos(const char *path,
          MENU_DIALOG_HELP_CHEEVOS_DESCRIPTION);
 }
 
+static void menu_input_st_cheat_cb(void *userdata, const char *str)
+{
+   (void)userdata;
+
+   if (str && *str)
+   {
+      unsigned cheat_index = menu_input_dialog_get_kb_type()
+         - MENU_SETTINGS_CHEAT_BEGIN;
+      cheat_manager_set_code(cheat_index, str);
+   }
+
+   menu_input_dialog_end();
+}
+
 static int action_ok_cheat(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 42904c5bb3..7a1fb9da7f 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -91,53 +91,6 @@ static menu_input_t *menu_input_get_ptr(void)
    return &menu_input_state;
 }
 
-void menu_input_st_uint_cb(void *userdata, const char *str)
-{
-   if (str && *str)
-   {
-      const char        *label = menu_input_dialog_get_label_buffer();
-      rarch_setting_t *setting = menu_setting_find(label);
-
-      setting_set_with_string_representation(setting, str);
-   }
-
-   menu_input_dialog_end();
-}
-
-void menu_input_st_hex_cb(void *userdata, const char *str)
-{
-   if (str && *str)
-   {
-      const char        *label = menu_input_dialog_get_label_buffer();
-      rarch_setting_t *setting = menu_setting_find(label);
-
-      if (setting)
-      {
-         unsigned *ptr = (unsigned*)setting_get_ptr(setting);
-         if (str[0] == '#')
-            str++;
-         if (ptr)
-            *ptr = strtoul(str, NULL, 16);
-      }
-   }
-
-   menu_input_dialog_end();
-}
-
-void menu_input_st_cheat_cb(void *userdata, const char *str)
-{
-   (void)userdata;
-
-   if (str && *str)
-   {
-      unsigned cheat_index = menu_input_dialog_get_kb_type()
-         - MENU_SETTINGS_CHEAT_BEGIN;
-      cheat_manager_set_code(cheat_index, str);
-   }
-
-   menu_input_dialog_end();
-}
-
 bool menu_input_mouse_check_vector_inside_hitbox(menu_input_ctx_hitbox_t *hitbox)
 {
    int16_t  mouse_x       = menu_input_mouse_state(MENU_MOUSE_X_AXIS);
diff --git a/menu/menu_input.h b/menu/menu_input.h
index e164be45da..1402e3d990 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -87,12 +87,6 @@ typedef struct menu_input_ctx_hitbox
    int32_t y2;
 } menu_input_ctx_hitbox_t;
 
-
-/* Keyboard input callbacks */
-void menu_input_st_uint_cb  (void *userdata, const char *str);
-void menu_input_st_hex_cb   (void *userdata, const char *str);
-void menu_input_st_cheat_cb (void *userdata, const char *str);
-
 unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_state);
 
 void menu_input_post_iterate(int *ret, unsigned action);
diff --git a/setting_list.c b/setting_list.c
index 683a64c8c3..a25e501f4c 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -1790,6 +1790,39 @@ static void menu_input_st_string_cb(void *userdata, const char *str)
    menu_input_dialog_end();
 }
 
+static void menu_input_st_uint_cb(void *userdata, const char *str)
+{
+   if (str && *str)
+   {
+      const char        *label = menu_input_dialog_get_label_buffer();
+      rarch_setting_t *setting = menu_setting_find(label);
+
+      setting_set_with_string_representation(setting, str);
+   }
+
+   menu_input_dialog_end();
+}
+
+static void menu_input_st_hex_cb(void *userdata, const char *str)
+{
+   if (str && *str)
+   {
+      const char        *label = menu_input_dialog_get_label_buffer();
+      rarch_setting_t *setting = menu_setting_find(label);
+
+      if (setting)
+      {
+         unsigned *ptr = (unsigned*)setting_get_ptr(setting);
+         if (str[0] == '#')
+            str++;
+         if (ptr)
+            *ptr = strtoul(str, NULL, 16);
+      }
+   }
+
+   menu_input_dialog_end();
+}
+
 static int setting_generic_action_ok_linefeed(void *data, bool wraparound)
 {
    menu_input_ctx_line_t line;