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/plugins/doom/rockdoom.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/plugins/doom/rockdoom.c')
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index ca08ec1665..1d065cc981 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -550,14 +550,15 @@ static bool Doptions() | |||
550 | return (1); | 550 | return (1); |
551 | } | 551 | } |
552 | 552 | ||
553 | char* choice_get_name(int selected_item, void * data, | 553 | static const char* choice_get_name(int selected_item, void * data, |
554 | char * buffer, size_t buffer_len) | 554 | char * buffer, size_t buffer_len) |
555 | { | 555 | { |
556 | char **names = (char **) data; | 556 | const char **names = (const char **) data; |
557 | (void) buffer; | 557 | (void) buffer; |
558 | (void) buffer_len; | 558 | (void) buffer_len; |
559 | return names[selected_item]; | 559 | return names[selected_item]; |
560 | } | 560 | } |
561 | |||
561 | int list_action_callback(int action, struct gui_synclist *lists) | 562 | int list_action_callback(int action, struct gui_synclist *lists) |
562 | { | 563 | { |
563 | (void) lists; | 564 | (void) lists; |
@@ -565,6 +566,7 @@ int list_action_callback(int action, struct gui_synclist *lists) | |||
565 | return ACTION_STD_CANCEL; | 566 | return ACTION_STD_CANCEL; |
566 | return action; | 567 | return action; |
567 | } | 568 | } |
569 | |||
568 | bool menuchoice(char **names, int count, int *selected) | 570 | bool menuchoice(char **names, int count, int *selected) |
569 | { | 571 | { |
570 | struct simplelist_info info; | 572 | struct simplelist_info info; |