diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-10-11 08:45:47 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-10-11 08:45:47 +0000 |
commit | 46943ad40c835999c24b345e4b19e37161f078b6 (patch) | |
tree | b8293fa22f546a5b0f3dffafa8d98060be854d47 /apps/menus/time_menu.c | |
parent | d6227edbb51aa5df03bd8951a582ece994611c2e (diff) | |
download | rockbox-46943ad40c835999c24b345e4b19e37161f078b6.tar.gz rockbox-46943ad40c835999c24b345e4b19e37161f078b6.zip |
Avoid more useless string copys and make some random cleanups
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23092 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/time_menu.c')
-rw-r--r-- | apps/menus/time_menu.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index e6cbb230da..cb0e4aac5b 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c | |||
@@ -160,8 +160,8 @@ static void talk_timedate(void) | |||
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
163 | static void vp_puts_center(struct viewport *vp, struct screen *display, int line, | 163 | static void vp_puts_center(struct viewport *vp, struct screen *display, |
164 | char *str) | 164 | int line, const char *str) |
165 | { | 165 | { |
166 | int w, offset; | 166 | int w, offset; |
167 | 167 | ||
@@ -180,6 +180,7 @@ static void draw_timedate(struct viewport *vp, struct screen *display) | |||
180 | struct tm *tm = get_time(); | 180 | struct tm *tm = get_time(); |
181 | int line; | 181 | int line; |
182 | char time[16], date[16]; | 182 | char time[16], date[16]; |
183 | const char *t = time, *d = date; | ||
183 | if (vp->height == 0) | 184 | if (vp->height == 0) |
184 | return; | 185 | return; |
185 | display->set_viewport(vp); | 186 | display->set_viewport(vp); |
@@ -205,13 +206,13 @@ static void draw_timedate(struct viewport *vp, struct screen *display) | |||
205 | } | 206 | } |
206 | else | 207 | else |
207 | { | 208 | { |
208 | snprintf(time, 16, "%s", "--:--:--"); | 209 | t = "--:--:--"; |
209 | snprintf(date, 16, "%s", str(LANG_UNKNOWN)); | 210 | d = str(LANG_UNKNOWN); |
210 | } | 211 | } |
211 | 212 | ||
212 | vp_puts_center(vp, display, line, time); | 213 | vp_puts_center(vp, display, line, t); |
213 | line++; | 214 | line++; |
214 | vp_puts_center(vp, display, line, date); | 215 | vp_puts_center(vp, display, line, d); |
215 | 216 | ||
216 | display->update_viewport(); | 217 | display->update_viewport(); |
217 | } | 218 | } |
@@ -307,3 +308,4 @@ int time_screen(void* ignored) | |||
307 | return 0; | 308 | return 0; |
308 | return ret; | 309 | return ret; |
309 | } | 310 | } |
311 | |||