devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Don't cast away constness

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23064 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-10-10 09:55:28 +00:00
parent 3c1e2c1777
commit bb1549aad7
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/gui/option_select.c
View file

@ -112,8 +112,8 @@ const char *option_get_valuestring(const struct settings_list *setting,
} }
else if ((setting->flags & F_T_SOUND) == F_T_SOUND) else if ((setting->flags & F_T_SOUND) == F_T_SOUND)
{ {
char sign = ' ', *unit; char sign = ' ';
unit = (char*)sound_unit(setting->sound_setting->setting); const char *unit = sound_unit(setting->sound_setting->setting);
if (sound_numdecimals(setting->sound_setting->setting)) if (sound_numdecimals(setting->sound_setting->setting))
{ {
int integer, dec; int integer, dec;
@ -124,7 +124,8 @@ const char *option_get_valuestring(const struct settings_list *setting,
sign = '-'; sign = '-';
val = abs(val); val = abs(val);
} }
integer = val / 10; dec = val % 10; integer = val / 10;
dec = val % 10;
snprintf(buffer, buf_len, "%c%d.%d %s", sign, integer, dec, unit); snprintf(buffer, buf_len, "%c%d.%d %s", sign, integer, dec, unit);
} }
else else
@ -148,7 +149,7 @@ const char *option_get_valuestring(const struct settings_list *setting,
} }
else else
{ {
int value= (int)temp_var; int value = (int)temp_var;
char *val = P2STR(setting->choice_setting->desc[value]); char *val = P2STR(setting->choice_setting->desc[value]);
strlcpy(buffer, val, buf_len); strlcpy(buffer, val, buf_len);
} }