From 89973217774f93f8dabcf41a559a5910b7b27f64 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Sun, 4 Sep 2011 13:17:09 +0000
Subject: Remove duplicated code to search for a setting by its cfg name

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30428 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/skin_engine/skin_parser.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'apps/gui')

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 59c7e92d90..adac487e27 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -620,13 +620,8 @@ static int parse_setting_and_lang(struct skin_element *element,
     }
     else
     {
-        /* Find the setting */
-        for (i=0; i<nb_settings; i++)
-            if (settings[i].cfg_name &&
-                !strcmp(settings[i].cfg_name, temp))
-                break;
 #ifndef __PCTOOL__
-        if (i == nb_settings)
+        if (find_setting_by_cfgname(temp, &i) == NULL)
             return WPS_ERROR_INVALID_PARAM;
 #endif
     }
@@ -1148,14 +1143,10 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no,
     int p = param_no;
     char *name = element->params[p++].data.text;
     int j;
-    /* Find the setting */
-    for (j=0; j<nb_settings; j++)
-        if (settings[j].cfg_name &&
-            !strcmp(settings[j].cfg_name, name))
-            break;
-    if (j==nb_settings)
+
+    region->setting_data.setting = find_setting_by_cfgname(name, &j);
+    if (region->setting_data.setting == NULL)
         return WPS_ERROR_INVALID_PARAM;
-    region->setting_data.setting = (void*)&settings[j];
     if (region->action == ACTION_SETTINGS_SET)
     {
         char* text;
-- 
cgit v1.2.3