summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-08-20 16:47:44 +0000
committerNils Wallménius <nils@rockbox.org>2009-08-20 16:47:44 +0000
commit3200d04d75c5e7556ed8880b155533e881a4d1e1 (patch)
tree188e2c9525b25cb8922a14766e51ab02bad3f831 /apps/menu.c
parent0a1728444882cdbc6a0c815bd88464de25ad94e9 (diff)
downloadrockbox-3200d04d75c5e7556ed8880b155533e881a4d1e1.tar.gz
rockbox-3200d04d75c5e7556ed8880b155533e881a4d1e1.tar.bz2
rockbox-3200d04d75c5e7556ed8880b155533e881a4d1e1.zip
Make the formatter functions used by the settings return a pointer to avoid usless copying of lang strings, this brought with it a long chain of const correctness and a few random cleanups
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22440 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r--apps/menu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 348095cd31..b442d4423d 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -93,10 +93,10 @@ static int find_menu_selection(int selected)
return i;
return 0;
}
-static char * get_menu_item_name(int selected_item,
- void * data,
- char *buffer,
- size_t buffer_len)
+static const char* get_menu_item_name(int selected_item,
+ void * data,
+ char *buffer,
+ size_t buffer_len)
{
const struct menu_item_ex *menu = (const struct menu_item_ex *)data;
int type = (menu->flags&MENU_TYPE_MASK);
@@ -109,7 +109,7 @@ static char * get_menu_item_name(int selected_item,
if (menu->flags&MENU_DYNAMIC_DESC)
return menu->menu_get_name_and_icon->list_get_name(selected_item,
menu->menu_get_name_and_icon->list_get_name_data, buffer);
- return (char*)menu->strings[selected_item];
+ return menu->strings[selected_item];
}
menu = menu->submenus[selected_item];