From dfc157d1d0b85f5b94c9e555f849aec8d19ad959 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Sat, 6 May 2023 23:19:39 +0200
Subject: [PATCH] Small cleanups

---
 menu/menu_driver.c  |  3 ++-
 menu/menu_setting.c | 24 ++++++------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 42339c7d9d..dd03e1d2ab 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -5551,7 +5551,8 @@ unsigned menu_event(
 
       /* Read mouse */
 #ifdef HAVE_IOS_TOUCHMOUSE
-       if (menu_mouse_enable) {
+       if (menu_mouse_enable)
+       {
          settings->bools.menu_pointer_enable=true;
          menu_pointer_enable=true;
        }
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 52404c1679..d5630c0252 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -508,18 +508,13 @@ static void setting_add_special_callbacks(
 
       switch ((*list)[idx].type)
       {
-         case ST_SIZE:
-         case ST_UINT:
-            (*list)[idx].action_cancel = NULL;
-            break;
-         case ST_INT:
-            (*list)[idx].action_cancel = NULL;
-            break;
-         case ST_FLOAT:
-            (*list)[idx].action_cancel = NULL;
-            break;
          case ST_STRING:
             (*list)[idx].action_start  = setting_string_action_start_generic;
+            /* fall-through */
+         case ST_SIZE:
+         case ST_UINT:
+         case ST_INT:
+         case ST_FLOAT:
             (*list)[idx].action_cancel = NULL;
             break;
          default:
@@ -554,8 +549,6 @@ unsigned setting_get_bind_type(rarch_setting_t *setting)
 static int setting_bind_action_ok(
       rarch_setting_t *setting, size_t idx, bool wraparound)
 {
-   (void)wraparound; /* TODO/FIXME - handle this */
-
    if (!menu_input_key_bind_set_mode(MENU_INPUT_BINDS_CTL_BIND_SINGLE, setting))
       return -1;
    return 0;
@@ -564,20 +557,15 @@ static int setting_bind_action_ok(
 static int setting_int_action_right_default(
       rarch_setting_t *setting, size_t idx, bool wraparound)
 {
-   float max = 0.0f;
-
    if (!setting)
       return -1;
 
-   max = setting->max;
-
-   (void)wraparound; /* TODO/FIXME - handle this */
-
    *setting->value.target.integer =
       *setting->value.target.integer + setting->step;
 
    if (setting->flags & SD_FLAG_ENFORCE_MAXRANGE)
    {
+      float max = setting->max;
       if (*setting->value.target.integer > max)
       {
          settings_t *settings = config_get_ptr();