summaryrefslogtreecommitdiff
path: root/apps/gui/option_select.c
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-05-01 13:48:28 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-05-01 13:48:28 +0000
commitf7c45941344ecfbcdd5d9b311b61573d37c6ef58 (patch)
tree4c2fa595d7209694dd30b0e0b349a0a44116d712 /apps/gui/option_select.c
parent08fb3f65745a237e2c1eae55d856ff27702246e5 (diff)
downloadrockbox-f7c45941344ecfbcdd5d9b311b61573d37c6ef58.tar.gz
rockbox-f7c45941344ecfbcdd5d9b311b61573d37c6ef58.zip
Fix further 'variable set but not used' warnings reported from GCC 4.6.0.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29809 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/option_select.c')
-rw-r--r--apps/gui/option_select.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 5d1e3d778e..f954268c18 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -315,7 +315,10 @@ void option_select_next_val(const struct settings_list *setting,
315 315
316static int selection_to_val(const struct settings_list *setting, int selection) 316static int selection_to_val(const struct settings_list *setting, int selection)
317{ 317{
318 int min = 0, max = 0, step = 1; 318 /* rockbox: comment 'set but unused' variables
319 int min = 0;
320 */
321 int max = 0, step = 1;
319 if (((setting->flags & F_BOOL_SETTING) == F_BOOL_SETTING) || 322 if (((setting->flags & F_BOOL_SETTING) == F_BOOL_SETTING) ||
320 ((setting->flags & F_CHOICE_SETTING) == F_CHOICE_SETTING)) 323 ((setting->flags & F_CHOICE_SETTING) == F_CHOICE_SETTING))
321 return selection; 324 return selection;
@@ -339,10 +342,10 @@ static int selection_to_val(const struct settings_list *setting, int selection)
339#ifndef ASCENDING_INT_SETTINGS 342#ifndef ASCENDING_INT_SETTINGS
340 step = sound_steps(setting_id); 343 step = sound_steps(setting_id);
341 max = sound_max(setting_id); 344 max = sound_max(setting_id);
342 min = sound_min(setting_id); 345 /* min = sound_min(setting_id); */
343#else 346#else
344 step = -sound_steps(setting_id); 347 step = -sound_steps(setting_id);
345 min = sound_max(setting_id); 348 /* min = sound_max(setting_id); */
346 max = sound_min(setting_id); 349 max = sound_min(setting_id);
347#endif 350#endif
348 } 351 }
@@ -350,12 +353,12 @@ static int selection_to_val(const struct settings_list *setting, int selection)
350 { 353 {
351 const struct int_setting *info = setting->int_setting; 354 const struct int_setting *info = setting->int_setting;
352#ifndef ASCENDING_INT_SETTINGS 355#ifndef ASCENDING_INT_SETTINGS
353 min = info->min; 356 /* min = info->min; */
354 max = info->max; 357 max = info->max;
355 step = info->step; 358 step = info->step;
356#else 359#else
357 max = info->min; 360 max = info->min;
358 min = info->max; 361 /* min = info->max; */
359 step = -info->step; 362 step = -info->step;
360#endif 363#endif
361 } 364 }