diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/apps/settings.c b/apps/settings.c index e60b1b5f1a..c19a0b9b65 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -335,7 +335,6 @@ bool settings_load_config(const char* file, bool apply) | |||
335 | { | 335 | { |
336 | logf("%s()\r\n", __func__); | 336 | logf("%s()\r\n", __func__); |
337 | const struct settings_list *setting; | 337 | const struct settings_list *setting; |
338 | int index; | ||
339 | int fd; | 338 | int fd; |
340 | char line[128]; | 339 | char line[128]; |
341 | char* name; | 340 | char* name; |
@@ -351,7 +350,7 @@ bool settings_load_config(const char* file, bool apply) | |||
351 | if (!settings_parseline(line, &name, &value)) | 350 | if (!settings_parseline(line, &name, &value)) |
352 | continue; | 351 | continue; |
353 | 352 | ||
354 | setting = find_setting_by_cfgname(name, &index); | 353 | setting = find_setting_by_cfgname(name); |
355 | if (!setting) | 354 | if (!setting) |
356 | continue; | 355 | continue; |
357 | 356 | ||
@@ -1158,36 +1157,32 @@ void settings_reset(void) | |||
1158 | } | 1157 | } |
1159 | 1158 | ||
1160 | /** Changing setting values **/ | 1159 | /** Changing setting values **/ |
1161 | const struct settings_list* find_setting(const void* variable, int *id) | 1160 | const struct settings_list* find_setting(const void* variable) |
1162 | { | 1161 | { |
1163 | int i; | 1162 | for(int i = 0; i < nb_settings; i++) |
1164 | for(i=0;i<nb_settings;i++) | ||
1165 | { | 1163 | { |
1166 | if (settings[i].setting == variable) | 1164 | const struct settings_list *setting = &settings[i]; |
1167 | { | 1165 | if (setting->setting == variable) |
1168 | if (id) | 1166 | return setting; |
1169 | *id = i; | ||
1170 | return &settings[i]; | ||
1171 | } | ||
1172 | } | 1167 | } |
1168 | |||
1173 | return NULL; | 1169 | return NULL; |
1174 | } | 1170 | } |
1175 | 1171 | ||
1176 | const struct settings_list* find_setting_by_cfgname(const char* name, int *id) | 1172 | const struct settings_list* find_setting_by_cfgname(const char* name) |
1177 | { | 1173 | { |
1178 | int i; | ||
1179 | logf("Searching for Setting: '%s'",name); | 1174 | logf("Searching for Setting: '%s'",name); |
1180 | for (i=0; i<nb_settings; i++) | 1175 | for(int i = 0; i < nb_settings; i++) |
1181 | { | 1176 | { |
1182 | if (settings[i].cfg_name && | 1177 | const struct settings_list *setting = &settings[i]; |
1183 | !strcasecmp(settings[i].cfg_name, name)) | 1178 | if (setting->cfg_name && !strcasecmp(setting->cfg_name, name)) |
1184 | { | 1179 | { |
1185 | logf("Found, flags: %s", debug_get_flags(settings[i].flags)); | 1180 | logf("Found, flags: %s", debug_get_flags(settings[i].flags)); |
1186 | if (id) *id = i; | 1181 | return setting; |
1187 | return &settings[i]; | ||
1188 | } | 1182 | } |
1189 | } | 1183 | } |
1190 | logf("Setting: '%s' Not Found!",name); | 1184 | logf("Setting: '%s' Not Found!",name); |
1185 | |||
1191 | return NULL; | 1186 | return NULL; |
1192 | } | 1187 | } |
1193 | 1188 | ||