summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-09-04 13:23:40 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-09-04 13:23:40 +0000
commit642736f53b153f544dc60bb5d7ff4f147ec760b4 (patch)
treeb215aba1800fc20479bdd7b26dda3d7a7db5adae
parent89973217774f93f8dabcf41a559a5910b7b27f64 (diff)
downloadrockbox-642736f53b153f544dc60bb5d7ff4f147ec760b4.tar.gz
rockbox-642736f53b153f544dc60bb5d7ff4f147ec760b4.zip
fix error, none of this code is needed or would work in the checkwps program anyway
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30429 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_parser.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index adac487e27..58ac5f552c 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1140,6 +1140,7 @@ static const struct touchaction touchactions[] = {
1140static int touchregion_setup_setting(struct skin_element *element, int param_no, 1140static int touchregion_setup_setting(struct skin_element *element, int param_no,
1141 struct touchregion *region) 1141 struct touchregion *region)
1142{ 1142{
1143#ifndef __PCTOOL__
1143 int p = param_no; 1144 int p = param_no;
1144 char *name = element->params[p++].data.text; 1145 char *name = element->params[p++].data.text;
1145 int j; 1146 int j;
@@ -1147,6 +1148,7 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no,
1147 region->setting_data.setting = find_setting_by_cfgname(name, &j); 1148 region->setting_data.setting = find_setting_by_cfgname(name, &j);
1148 if (region->setting_data.setting == NULL) 1149 if (region->setting_data.setting == NULL)
1149 return WPS_ERROR_INVALID_PARAM; 1150 return WPS_ERROR_INVALID_PARAM;
1151
1150 if (region->action == ACTION_SETTINGS_SET) 1152 if (region->action == ACTION_SETTINGS_SET)
1151 { 1153 {
1152 char* text; 1154 char* text;
@@ -1155,7 +1157,7 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no,
1155 &region->setting_data; 1157 &region->setting_data;
1156 if (element->params_count < p+1) 1158 if (element->params_count < p+1)
1157 return -1; 1159 return -1;
1158#ifndef __PCTOOL__ 1160
1159 text = element->params[p++].data.text; 1161 text = element->params[p++].data.text;
1160 switch (settings[j].flags&F_T_MASK) 1162 switch (settings[j].flags&F_T_MASK)
1161 { 1163 {
@@ -1190,9 +1192,10 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no,
1190 default: 1192 default:
1191 return -1; 1193 return -1;
1192 } 1194 }
1193#endif /* __PCTOOL__ */
1194 } 1195 }
1195 return p-param_no; 1196 return p-param_no;
1197#endif /* __PCTOOL__ */
1198 return 0;
1196} 1199}
1197 1200
1198static int parse_touchregion(struct skin_element *element, 1201static int parse_touchregion(struct skin_element *element,