From 08d3fe8c0439a3c978202a6ffb26d46732ade005 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 23 Sep 2019 04:19:52 +0200
Subject: [PATCH] Cleanups

---
 menu/cbs/menu_cbs_ok.c     | 38 --------------------------------------
 menu/menu_thumbnail_path.c | 17 +++++++----------
 2 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 3b31b91c05..ac9d5408f3 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -319,44 +319,6 @@ static const char *get_default_shader_dir(void)
    settings_t *settings       = config_get_ptr();
    const char *def_shader_dir = settings->paths.directory_video_shader;
    return def_shader_dir;
-#if 0
-   bool slang_supported       = video_shader_is_supported(RARCH_SHADER_SLANG);
-   bool glsl_supported        = video_shader_is_supported(RARCH_SHADER_GLSL);
-   bool cg_supported          = video_shader_is_supported(RARCH_SHADER_CG);
-
-   if (slang_supported)
-   {
-      static char new_path[1024];
-      new_path[0] = '\0';
-      fill_pathname_join(new_path,
-            def_shader_dir, "shaders_slang",
-            sizeof(new_path));
-      if (path_is_directory(new_path))
-         return new_path;
-   }
-   else if (glsl_supported && !cg_supported)
-   {
-      static char new_path[1024];
-      new_path[0] = '\0';
-      fill_pathname_join(new_path,
-            def_shader_dir, "shaders_glsl",
-            sizeof(new_path));
-      if (path_is_directory(new_path))
-         return new_path;
-   }
-   else if (cg_supported   && !glsl_supported)
-   {
-      static char new_path[1024];
-      new_path[0] = '\0';
-      fill_pathname_join(new_path,
-            def_shader_dir, "shaders_cg",
-            sizeof(new_path));
-      if (path_is_directory(new_path))
-         return new_path;
-   }
-
-   return def_shader_dir;
-#endif
 }
 #endif
 
diff --git a/menu/menu_thumbnail_path.c b/menu/menu_thumbnail_path.c
index 67b60b0d69..e5002aff3d 100644
--- a/menu/menu_thumbnail_path.c
+++ b/menu/menu_thumbnail_path.c
@@ -185,13 +185,11 @@ bool menu_thumbnail_is_enabled(menu_thumbnail_path_data_t *path_data, enum menu_
       case MENU_THUMBNAIL_RIGHT:
          if (path_data->playlist_right_mode != PLAYLIST_THUMBNAIL_MODE_DEFAULT)
             return path_data->playlist_right_mode != PLAYLIST_THUMBNAIL_MODE_OFF;
-         else
-            return settings->uints.menu_thumbnails != 0;
+         return settings->uints.menu_thumbnails != 0;
       case MENU_THUMBNAIL_LEFT:
          if (path_data->playlist_left_mode != PLAYLIST_THUMBNAIL_MODE_DEFAULT)
             return path_data->playlist_left_mode != PLAYLIST_THUMBNAIL_MODE_OFF;
-         else
-            return settings->uints.menu_left_thumbnails != 0;
+         return settings->uints.menu_left_thumbnails != 0;
       default:
          break;
    }
@@ -229,7 +227,8 @@ static void fill_content_img(menu_thumbnail_path_data_t *path_data)
  * usage of menu_thumbnail_is_enabled())
  * > Used as a fallback when individual content lacks an
  *   associated database name */
-bool menu_thumbnail_set_system(menu_thumbnail_path_data_t *path_data, const char *system, playlist_t *playlist)
+bool menu_thumbnail_set_system(menu_thumbnail_path_data_t *path_data,
+      const char *system, playlist_t *playlist)
 {
    if (!path_data)
       return false;
@@ -252,9 +251,7 @@ bool menu_thumbnail_set_system(menu_thumbnail_path_data_t *path_data, const char
    /* Hack: There is only one MAME thumbnail repo,
     * so filter any input starting with 'MAME...' */
    if (strncmp(system, "MAME", 4) == 0)
-   {
       strlcpy(path_data->system, "MAME", sizeof(path_data->system));
-   }
    else
       strlcpy(path_data->system, system, sizeof(path_data->system));
    
@@ -299,8 +296,7 @@ bool menu_thumbnail_set_system(menu_thumbnail_path_data_t *path_data, const char
          tmp[0] = '\0';
          
          strlcpy(tmp, playlist_file, sizeof(tmp));
-         playlist_name = path_remove_extension(tmp);
-         
+         playlist_name  = path_remove_extension(tmp);
          playlist_valid = string_is_equal(playlist_name, system);
       }
       
@@ -516,7 +512,8 @@ bool menu_thumbnail_set_content_playlist(menu_thumbnail_path_data_t *path_data,
       /* Hack: There is only one MAME thumbnail repo,
        * so filter any input starting with 'MAME...' */
       if (strncmp(db_name, "MAME", 4) == 0)
-         strlcpy(path_data->content_db_name, "MAME", sizeof(path_data->content_db_name));
+         strlcpy(path_data->content_db_name, "MAME",
+               sizeof(path_data->content_db_name));
       else
       {
          char *db_name_no_ext = NULL;