diff options
| author | Nils Wallménius <nils@rockbox.org> | 2008-04-09 16:01:40 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2008-04-09 16:01:40 +0000 |
| commit | 8dca930a1a2e7cefeb483361abe243d842476990 (patch) | |
| tree | 97ae4e299ae658e9642fc13c1c561ecf2c41439e /apps | |
| parent | 8fef5a602276a68091518553ba32f599a361d68c (diff) | |
| download | rockbox-8dca930a1a2e7cefeb483361abe243d842476990.zip rockbox-8dca930a1a2e7cefeb483361abe243d842476990.tar.gz rockbox-8dca930a1a2e7cefeb483361abe243d842476990.tar.bz2 rockbox-8dca930a1a2e7cefeb483361abe243d842476990.tar.xz | |
Some small binsize savings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17052 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/menus/main_menu.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 4ca76e3..39f722f 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -145,6 +145,12 @@ enum infoscreenorder INFO_COUNT }; +static const unsigned char *kbyte_units[] = +{ + ID2P(LANG_KILOBYTE), + ID2P(LANG_MEGABYTE), + ID2P(LANG_GIGABYTE) +}; static char* info_getname(int selected_item, void *data, char *buffer, size_t buffer_len) @@ -153,12 +159,6 @@ static char* info_getname(int selected_item, void *data, #if CONFIG_RTC struct tm *tm; #endif - const unsigned char *kbyte_units[] = - { - ID2P(LANG_KILOBYTE), - ID2P(LANG_MEGABYTE), - ID2P(LANG_GIGABYTE) - }; char s1[32]; #ifdef HAVE_MULTIVOLUME char s2[32]; @@ -211,26 +211,26 @@ static char* info_getname(int selected_item, void *data, case INFO_BATTERY: /* battery */ #if CONFIG_CHARGING == CHARGING_SIMPLE if (charger_input_state == CHARGER) - snprintf(buffer, buffer_len, (char *)str(LANG_BATTERY_CHARGE)); + return (char *)str(LANG_BATTERY_CHARGE); else #elif CONFIG_CHARGING >= CHARGING_MONITOR if (charge_state == CHARGING) - snprintf(buffer, buffer_len, (char *)str(LANG_BATTERY_CHARGE)); + return (char *)str(LANG_BATTERY_CHARGE); else #if CONFIG_CHARGING == CHARGING_CONTROL if (charge_state == TOPOFF) - snprintf(buffer, buffer_len, (char *)str(LANG_BATTERY_TOPOFF_CHARGE)); + return (char *)str(LANG_BATTERY_TOPOFF_CHARGE); else #endif if (charge_state == TRICKLE) - snprintf(buffer, buffer_len, (char *)str(LANG_BATTERY_TRICKLE_CHARGE)); + return (char *)str(LANG_BATTERY_TRICKLE_CHARGE); else #endif if (battery_level() >= 0) snprintf(buffer, buffer_len, (char *)str(LANG_BATTERY_TIME), battery_level(), battery_time() / 60, battery_time() % 60); else - strcpy(buffer, "(n/a)"); + return "(n/a)"; break; case INFO_DISK1: /* disk usage 1 */ #ifdef HAVE_MULTIVOLUME @@ -269,11 +269,7 @@ static char* info_getname(int selected_item, void *data, static int info_speak_item(int selected_item, void * data) { struct info_data *info = (struct info_data*)data; - const unsigned char *kbyte_units[] = { - ID2P(LANG_KILOBYTE), - ID2P(LANG_MEGABYTE), - ID2P(LANG_GIGABYTE) - }; + switch (selected_item) { case INFO_VERSION: /* version */ |