settings: More settings ID to pointer conversions

Convert cfg_int_to_string(), cfg_to_string(), settings_write_config().

Change-Id: Icb72d2ff874cf90ffe5fe14878aece0a53f6bd18

2 files changed, 2 insertions, 4 deletions

diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 4687367fba..afd97e418b 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -117,7 +117,6 @@ const char *option_get_valuestring(const struct settings_list *setting,
     {
         if (setting->flags & F_CHOICETALKS)
         {
-            int setting_id;
             const struct choice_setting *info = setting->choice_setting;
             if (info->talks[(int)temp_var] < LANG_LAST_INDEX_IN_ARRAY)
             {
@@ -125,8 +124,7 @@ const char *option_get_valuestring(const struct settings_list *setting,
             }
             else
             {
-                find_setting(setting->setting, &setting_id);
-                cfg_int_to_string(setting_id, (int)temp_var, buffer, buf_len);
+                cfg_int_to_string(setting, (int)temp_var, buffer, buf_len);
             }
         }
         else
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 874eff3809..39f1e3b4db 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -1442,7 +1442,7 @@ const char *get_token_value(struct gui_wps *gwps,
                     goto gtv_ret_numeric_tag_info;
                 }
             }
-            cfg_to_string(token->value.i,buf,buf_size);
+            cfg_to_string(s, buf, buf_size);
             numeric_buf = buf;
             goto gtv_ret_numeric_tag_info;
         }