summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-10-10 09:55:28 +0000
committerNils Wallménius <nils@rockbox.org>2009-10-10 09:55:28 +0000
commitbb1549aad76ee096b00451ff3640748d74ab3a08 (patch)
treec9c9dea67a234e41ced3316b66aa8913d5f0d8cb
parent3c1e2c1777485909f29913d1ba6e60ac27fa3893 (diff)
downloadrockbox-bb1549aad76ee096b00451ff3640748d74ab3a08.tar.gz
rockbox-bb1549aad76ee096b00451ff3640748d74ab3a08.zip
Don't cast away constness
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23064 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/option_select.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 97c2b75d1b..7d142b0311 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -112,8 +112,8 @@ const char *option_get_valuestring(const struct settings_list *setting,
112 } 112 }
113 else if ((setting->flags & F_T_SOUND) == F_T_SOUND) 113 else if ((setting->flags & F_T_SOUND) == F_T_SOUND)
114 { 114 {
115 char sign = ' ', *unit; 115 char sign = ' ';
116 unit = (char*)sound_unit(setting->sound_setting->setting); 116 const char *unit = sound_unit(setting->sound_setting->setting);
117 if (sound_numdecimals(setting->sound_setting->setting)) 117 if (sound_numdecimals(setting->sound_setting->setting))
118 { 118 {
119 int integer, dec; 119 int integer, dec;
@@ -124,7 +124,8 @@ const char *option_get_valuestring(const struct settings_list *setting,
124 sign = '-'; 124 sign = '-';
125 val = abs(val); 125 val = abs(val);
126 } 126 }
127 integer = val / 10; dec = val % 10; 127 integer = val / 10;
128 dec = val % 10;
128 snprintf(buffer, buf_len, "%c%d.%d %s", sign, integer, dec, unit); 129 snprintf(buffer, buf_len, "%c%d.%d %s", sign, integer, dec, unit);
129 } 130 }
130 else 131 else
@@ -148,7 +149,7 @@ const char *option_get_valuestring(const struct settings_list *setting,
148 } 149 }
149 else 150 else
150 { 151 {
151 int value= (int)temp_var; 152 int value = (int)temp_var;
152 char *val = P2STR(setting->choice_setting->desc[value]); 153 char *val = P2STR(setting->choice_setting->desc[value]);
153 strlcpy(buffer, val, buf_len); 154 strlcpy(buffer, val, buf_len);
154 } 155 }