From 21dff0771e9c9c8eef22f8434e08f34a8bd3eb09 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 17 Aug 2014 16:20:37 +0200
Subject: [PATCH] Rewrite setting_data_get_string_representation

---
 apple/iOS/menu.m | 21 +++++++++++++++------
 settings_data.c  | 35 ++++++++++++++++++++++-------------
 settings_data.h  |  2 +-
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m
index 1bd30608c0..ba08c0aaf4 100644
--- a/apple/iOS/menu.m
+++ b/apple/iOS/menu.m
@@ -241,11 +241,15 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
 
    if (self.setting)
    {
-       if (self.setting->short_description)
-           result.textLabel.text = BOXSTRING(self.setting->short_description);
-       
-      result.detailTextLabel.text = BOXSTRING(setting_data_get_string_representation(self.setting, buffer, sizeof(buffer)));
-      
+      if (self.setting->short_description)
+         result.textLabel.text = BOXSTRING(self.setting->short_description);
+
+      setting_data_get_string_representation(self.setting, buffer, sizeof(buffer));
+      if (buffer[0] == '\0')
+         strlcpy(buffer, "N/A", sizeof(buffer));
+
+      result.detailTextLabel.text = BOXSTRING(buffer);
+
       if (self.setting->type == ST_PATH)
          result.detailTextLabel.text = [result.detailTextLabel.text lastPathComponent];
    }
@@ -268,7 +272,12 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
    field = [alertView textFieldAtIndex:0];
    
    field.delegate = self.formatter;
-   field.placeholder = BOXSTRING(setting_data_get_string_representation(self.setting, buffer, sizeof(buffer)));
+
+   setting_data_get_string_representation(self.setting, buffer, sizeof(buffer));
+   if (buffer[0] == '\0')
+      strlcpy(buffer, "N/A", sizeof(buffer));
+
+   field.placeholder = BOXSTRING(buffer);
 
    [alertView show];
 }
diff --git a/settings_data.c b/settings_data.c
index 169acecec1..3adbf45933 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -369,29 +369,29 @@ void setting_data_set_with_string_representation(const rarch_setting_t* setting,
       setting->change_handler(setting);
 }
 
-const char* setting_data_get_string_representation(const rarch_setting_t* setting, char* buffer, size_t length)
+void setting_data_get_string_representation(const rarch_setting_t* setting, char* buf, size_t sizeof_buf)
 {
-   if (!setting || !buffer || !length)
-      return "";
+   if (!setting || !buf || !sizeof_buf)
+      return;
 
    switch (setting->type)
    {
       case ST_BOOL:
-         snprintf(buffer, length, "%s", *setting->value.boolean ? "True" : "False");
+         snprintf(buf, sizeof_buf, "%s", *setting->value.boolean ? "True" : "False");
          break;
       case ST_INT:
-         snprintf(buffer, length, "%d", *setting->value.integer);
+         snprintf(buf, sizeof_buf, "%d", *setting->value.integer);
          break;
       case ST_UINT:
-         snprintf(buffer, length, "%u", *setting->value.unsigned_integer);
+         snprintf(buf, sizeof_buf, "%u", *setting->value.unsigned_integer);
          break;
       case ST_FLOAT:
-         snprintf(buffer, length, "%f", *setting->value.fraction);
+         snprintf(buf, sizeof_buf, "%f", *setting->value.fraction);
          break;
       case ST_PATH:
       case ST_DIR:
       case ST_STRING:
-         strlcpy(buffer, setting->value.string, length);
+         strlcpy(buf, setting->value.string, sizeof_buf);
          break;
       case ST_BIND:
          {
@@ -406,14 +406,23 @@ const char* setting_data_get_string_representation(const rarch_setting_t* settin
 #ifdef APPLE
             get_key_name(key_name, sizeof(key_name), setting);
 #endif
-            snprintf(buffer, length, "[KB:%s] [JS:%s] [AX:%s]", key_name, button_name, axis_name);
+            snprintf(buf, sizeof_buf, "[KB:%s] [JS:%s] [AX:%s]", key_name, button_name, axis_name);
          }
          break;
-      default:
-         return "";
+         /* TODO */
+      case ST_HEX:
+         break;
+      case ST_GROUP:
+         break;
+      case ST_SUB_GROUP:
+         break;
+      case ST_END_GROUP:
+         break;
+      case ST_END_SUB_GROUP:
+         break;
+      case ST_NONE:
+         break;
    }
-
-   return buffer;
 }
 
 rarch_setting_t setting_data_group_setting(enum setting_type type, const char* name)
diff --git a/settings_data.h b/settings_data.h
index 327690829f..e61210a71f 100644
--- a/settings_data.h
+++ b/settings_data.h
@@ -110,7 +110,7 @@ bool setting_data_save_config(const rarch_setting_t* settings, config_file_t* co
 rarch_setting_t* setting_data_find_setting(rarch_setting_t* settings, const char* name);
 
 void setting_data_set_with_string_representation(const rarch_setting_t* setting, const char* value);
-const char* setting_data_get_string_representation(const rarch_setting_t* setting, char* buffer, size_t length);
+void setting_data_get_string_representation(const rarch_setting_t* setting, char* buf, size_t sizeof_buf);
 
 // List building helper functions
 rarch_setting_t setting_data_group_setting(enum setting_type type, const char* name);