From 3200d04d75c5e7556ed8880b155533e881a4d1e1 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Thu, 20 Aug 2009 16:47:44 +0000 Subject: 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 --- apps/menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/menu.c') 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]; -- cgit v1.2.3