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

Avoid more useless string copys and make some random cleanups

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23092 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-10-11 08:45:47 +00:00
parent d6227edbb5
commit 46943ad40c
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/menus/time_menu.c
View file

@ -160,8 +160,8 @@ static void talk_timedate(void)
} }
} }
static void vp_puts_center(struct viewport *vp, struct screen *display, int line, static void vp_puts_center(struct viewport *vp, struct screen *display,
char *str) int line, const char *str)
{ {
int w, offset; int w, offset;
@ -180,6 +180,7 @@ static void draw_timedate(struct viewport *vp, struct screen *display)
struct tm *tm = get_time(); struct tm *tm = get_time();
int line; int line;
char time[16], date[16]; char time[16], date[16];
const char *t = time, *d = date;
if (vp->height == 0) if (vp->height == 0)
return; return;
display->set_viewport(vp); display->set_viewport(vp);
@ -205,13 +206,13 @@ static void draw_timedate(struct viewport *vp, struct screen *display)
} }
else else
{ {
snprintf(time, 16, "%s", "--:--:--"); t = "--:--:--";
snprintf(date, 16, "%s", str(LANG_UNKNOWN)); d = str(LANG_UNKNOWN);
} }
vp_puts_center(vp, display, line, time); vp_puts_center(vp, display, line, t);
line++; line++;
vp_puts_center(vp, display, line, date); vp_puts_center(vp, display, line, d);
display->update_viewport(); display->update_viewport();
} }
@ -307,3 +308,4 @@ int time_screen(void* ignored)
return 0; return 0;
return ret; return ret;
} }

6
apps/recorder/radio.c
View file

@ -952,10 +952,10 @@ int radio_screen(void)
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
screens[i].puts_scroll(0, top_of_screen + 1, buf); screens[i].puts_scroll(0, top_of_screen + 1, buf);
snprintf(buf, 128, "%s", stereo?str(LANG_CHANNEL_STEREO):
str(LANG_CHANNEL_MONO));
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
screens[i].puts_scroll(0, top_of_screen + 2, buf); screens[i].puts_scroll(0, top_of_screen + 2,
stereo ? str(LANG_CHANNEL_STEREO) :
str(LANG_CHANNEL_MONO));
snprintf(buf, 128, "%s %s", str(LANG_MODE), snprintf(buf, 128, "%s %s", str(LANG_MODE),
radio_mode ? str(LANG_PRESET) : radio_mode ? str(LANG_PRESET) :

9
apps/recorder/recording.c
View file

@ -965,7 +965,7 @@ static const char* reclist_get_name(int selected_item, void * data,
} }
else else
{ {
strlcpy(buffer, str(LANG_RECORDING_FILENAME), buffer_len); return str(LANG_RECORDING_FILENAME);
} }
break; break;
} }
@ -1970,7 +1970,7 @@ static bool f2_rec_screen(void)
} }
while (!exit) { while (!exit) {
const char* ptr=NULL; const char* ptr;
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
@ -2090,7 +2090,7 @@ static bool f3_rec_screen(void)
bool used = false; bool used = false;
int w, h, i; int w, h, i;
int button; int button;
char *src_str[] = const char *src_str[] =
{ {
str(LANG_SYSFONT_RECORDING_SRC_MIC), str(LANG_SYSFONT_RECORDING_SRC_MIC),
str(LANG_SYSFONT_LINE_IN), str(LANG_SYSFONT_LINE_IN),
@ -2105,8 +2105,7 @@ static bool f3_rec_screen(void)
} }
while (!exit) { while (!exit) {
char* ptr=NULL; const char* ptr = src_str[global_settings.rec_source];
ptr = src_str[global_settings.rec_source];
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
screens[i].clear_display(); screens[i].clear_display();