From 92465e3acd62211ba035db819b8bf1029f1d7463 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 14 Dec 2016 16:19:32 +0100
Subject: [PATCH] Turn setting_get_type into a macro

---
 menu/menu_setting.c | 2 +-
 setting_list.c      | 7 -------
 setting_list.h      | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 3166d7b4e5..84576ed52d 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -111,7 +111,7 @@ static void setting_get_string_representation_cheevos_password(void *data,
    if (!setting)
       return;
 
-   if (*setting->value.target.string)
+   if (!string_is_empty(setting->value.target.string))
       snprintf(s, len, "%s",
             "********");
    else
diff --git a/setting_list.c b/setting_list.c
index 5395c9ef2c..3d07bf7111 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -103,13 +103,6 @@ bool settings_list_append(rarch_setting_t **list,
    return true;
 }
 
-enum setting_type setting_get_type(rarch_setting_t *setting)		
-{		
-   if (!setting)		
-      return ST_NONE;		
-   return setting->type;		
-}
-
 unsigned setting_get_bind_type(rarch_setting_t *setting)
 {
    if (!setting)
diff --git a/setting_list.h b/setting_list.h
index 6ec91a4aad..b4cfca6ecd 100644
--- a/setting_list.h
+++ b/setting_list.h
@@ -414,7 +414,7 @@ void settings_data_list_current_add_free_flags(
       rarch_setting_info_t *list_info,
       unsigned values);
 
-enum setting_type setting_get_type(rarch_setting_t *setting);
+#define setting_get_type(setting) ((setting) ? setting->type : ST_NONE)
 
 rarch_setting_t setting_terminator_setting(void);