diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-08-20 16:47:44 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-08-20 16:47:44 +0000 |
commit | 3200d04d75c5e7556ed8880b155533e881a4d1e1 (patch) | |
tree | 188e2c9525b25cb8922a14766e51ab02bad3f831 /apps/menu.c | |
parent | 0a1728444882cdbc6a0c815bd88464de25ad94e9 (diff) | |
download | rockbox-3200d04d75c5e7556ed8880b155533e881a4d1e1.tar.gz 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.c | 10 |
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) | |||
93 | return i; | 93 | return i; |
94 | return 0; | 94 | return 0; |
95 | } | 95 | } |
96 | static char * get_menu_item_name(int selected_item, | 96 | static const char* get_menu_item_name(int selected_item, |
97 | void * data, | 97 | void * data, |
98 | char *buffer, | 98 | char *buffer, |
99 | size_t buffer_len) | 99 | size_t buffer_len) |
100 | { | 100 | { |
101 | const struct menu_item_ex *menu = (const struct menu_item_ex *)data; | 101 | const struct menu_item_ex *menu = (const struct menu_item_ex *)data; |
102 | int type = (menu->flags&MENU_TYPE_MASK); | 102 | int type = (menu->flags&MENU_TYPE_MASK); |
@@ -109,7 +109,7 @@ static char * get_menu_item_name(int selected_item, | |||
109 | if (menu->flags&MENU_DYNAMIC_DESC) | 109 | if (menu->flags&MENU_DYNAMIC_DESC) |
110 | return menu->menu_get_name_and_icon->list_get_name(selected_item, | 110 | return menu->menu_get_name_and_icon->list_get_name(selected_item, |
111 | menu->menu_get_name_and_icon->list_get_name_data, buffer); | 111 | menu->menu_get_name_and_icon->list_get_name_data, buffer); |
112 | return (char*)menu->strings[selected_item]; | 112 | return menu->strings[selected_item]; |
113 | } | 113 | } |
114 | 114 | ||
115 | menu = menu->submenus[selected_item]; | 115 | menu = menu->submenus[selected_item]; |