From 6891ca7479ef8f2e5e6856de5e971e40f14a4cc2 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 15 Jun 2015 19:20:48 +0200
Subject: [PATCH] (menu_input.c) Cleanups

---
 menu/menu_input.c   | 28 ++++------------------------
 menu/menu_setting.c |  4 ----
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/menu/menu_input.c b/menu/menu_input.c
index 09fefc88cc..058b36d397 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -98,10 +98,9 @@ static void menu_input_search_callback(void *userdata, const char *str)
 
 void menu_input_st_uint_callback(void *userdata, const char *str)
 {
-   menu_handle_t      *menu = menu_driver_get_ptr();
    menu_input_t *menu_input = menu_input_get_ptr();
 
-   if (!menu || !menu_input)
+   if (!menu_input)
       return;
 
    if (str && *str)
@@ -116,10 +115,9 @@ void menu_input_st_uint_callback(void *userdata, const char *str)
 
 void menu_input_st_hex_callback(void *userdata, const char *str)
 {
-   menu_handle_t *menu      = menu_driver_get_ptr();
    menu_input_t *menu_input = menu_input_get_ptr();
 
-   if (!menu || !menu_input)
+   if (!menu_input)
       return;
 
    if (str && *str)
@@ -137,10 +135,9 @@ void menu_input_st_hex_callback(void *userdata, const char *str)
 
 void menu_input_st_string_callback(void *userdata, const char *str)
 {
-   menu_handle_t      *menu = menu_driver_get_ptr();
    menu_input_t *menu_input = menu_input_get_ptr();
 
-   if (!menu || !menu_input)
+   if (!menu_input)
       return;
 
    if (str && *str)
@@ -534,15 +531,11 @@ int menu_input_bind_iterate(void)
    struct menu_bind_state binds;
    char msg[PATH_MAX_LENGTH]    = {0};
    int timeout                  = 0;
-   menu_handle_t *menu          = menu_driver_get_ptr();
    menu_input_t *menu_input     = menu_input_get_ptr();
    driver_t *driver             = driver_get_ptr();
    global_t *global             = global_get_ptr();
    bool bind_mode_kb            = global ? global->menu.bind_mode_keyboard : false;
 
-   if (!menu)
-      return 1;
-
    menu_driver_render();
 
    current = rarch_get_time_usec();
@@ -596,15 +589,11 @@ static int menu_input_mouse(unsigned *action)
    video_viewport_t vp;
    const struct retro_keybind *binds[MAX_USERS];
    driver_t *driver          = driver_get_ptr();
-   menu_handle_t *menu       = menu_driver_get_ptr();
    menu_animation_t *anim    = menu_animation_get_ptr();
    menu_input_t *menu_input  = menu_input_get_ptr();
    menu_framebuf_t *frame_buf= menu_display_fb_get_ptr();
    settings_t *settings      = config_get_ptr();
 
-   if (!menu)
-      return -1;
-
    if (!settings->menu.mouse.enable
 #ifdef HAVE_OVERLAY
        || (settings->input.overlay_enable && driver && driver->overlay)
@@ -687,16 +676,12 @@ static int menu_input_pointer(unsigned *action)
 {
    int pointer_device, pointer_x, pointer_y;
    const struct retro_keybind *binds[MAX_USERS] = {NULL};
-   menu_handle_t *menu       = menu_driver_get_ptr();
    menu_input_t *menu_input  = menu_input_get_ptr();
    menu_animation_t *anim    = menu_animation_get_ptr();
    menu_framebuf_t *frame_buf= menu_display_fb_get_ptr();
    settings_t *settings      = config_get_ptr();
    driver_t *driver          = driver_get_ptr();
 
-   if (!menu)
-      return -1;
-
    if (!settings->menu.pointer.enable)
    {
       memset(&menu_input->pointer, 0, sizeof(menu_input->pointer));
@@ -769,7 +754,6 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
 {
    driver_t      *driver    = driver_get_ptr();
    settings_t *settings     = config_get_ptr();
-   menu_handle_t *menu      = menu_driver_get_ptr();
    menu_display_t *disp     = menu_display_get_ptr();
    menu_input_t *menu_input = menu_input_get_ptr();
    menu_list_t *menu_list   = menu_list_get_ptr();
@@ -777,9 +761,6 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
 
    *input_mouse = MOUSE_ACTION_NONE;
 
-   if (!menu)
-      return -1;
-
    if (!settings->menu.mouse.enable
 #ifdef HAVE_OVERLAY
        || (settings->input.overlay_enable && driver && driver->overlay)
@@ -884,14 +865,13 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
       menu_entry_t *entry, unsigned action)
 {
    int ret                  = 0;
-   menu_handle_t *menu      = menu_driver_get_ptr();
    menu_display_t *disp     = menu_display_get_ptr();
    menu_list_t *menu_list   = menu_list_get_ptr();
    menu_input_t *menu_input = menu_input_get_ptr();
    driver_t *driver         = driver_get_ptr();
    settings_t *settings     = config_get_ptr();
 
-   if (!menu || !menu_input)
+   if (!menu_input)
       return -1;
 
    if (!settings->menu.pointer.enable
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 38923ae474..25f7efcc67 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -346,13 +346,9 @@ int menu_setting_set(unsigned type, const char *label,
 {
    int ret                  = 0;
    rarch_setting_t *setting = NULL;
-   menu_handle_t      *menu = menu_driver_get_ptr();
    menu_navigation_t   *nav = menu_navigation_get_ptr();
    menu_list_t   *menu_list = menu_list_get_ptr();
 
-   if (!menu)
-      return 0;
-   
    setting = menu_setting_find(
          menu_list->selection_buf->list
          [nav->selection_ptr].label);