From e406967e122728211058cc7e81779cddc31c21ac Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sun, 17 Jan 2016 15:32:22 +0000
Subject: [PATCH] cleanup: usermenu.c use const edit_widget
use const because edit_widget not altered in these functions
Signed-off-by: Andreas Mohr <and@gmx.li>
---
src/filemanager/usermenu.c | 10 +++++-----
src/filemanager/usermenu.h | 4 ++--
tests/src/filemanager/examine_cd.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/filemanager/usermenu.c b/src/filemanager/usermenu.c
index 16e0c5d..5ba3917 100644
a
|
b
|
test_type (WPanel * panel, char *arg) |
214 | 214 | p. Returns the point after condition. */ |
215 | 215 | |
216 | 216 | static char * |
217 | | test_condition (WEdit * edit_widget, char *p, gboolean * condition) |
| 217 | test_condition (const WEdit * edit_widget, char *p, gboolean * condition) |
218 | 218 | { |
219 | 219 | char arg[256]; |
220 | 220 | const mc_search_type_t search_type = easy_patterns ? MC_SEARCH_T_GLOB : MC_SEARCH_T_REGEX; |
… |
… |
debug_out (char *start, char *end, gboolean condition) |
356 | 356 | the point just before the end of line. */ |
357 | 357 | |
358 | 358 | static char * |
359 | | test_line (WEdit * edit_widget, char *p, gboolean * result) |
| 359 | test_line (const WEdit * edit_widget, char *p, gboolean * result) |
360 | 360 | { |
361 | 361 | char operator; |
362 | 362 | |
… |
… |
test_line (WEdit * edit_widget, char *p, gboolean * result) |
422 | 422 | /** FIXME: recode this routine on version 3.0, it could be cleaner */ |
423 | 423 | |
424 | 424 | static void |
425 | | execute_menu_command (WEdit * edit_widget, const char *commands, gboolean show_prompt) |
| 425 | execute_menu_command (const WEdit * edit_widget, const char *commands, gboolean show_prompt) |
426 | 426 | { |
427 | 427 | FILE *cmd_file; |
428 | 428 | int cmd_file_fd; |
… |
… |
check_format_var (const char *p, char **v) |
729 | 729 | /* --------------------------------------------------------------------------------------------- */ |
730 | 730 | |
731 | 731 | char * |
732 | | expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) |
| 732 | expand_format (const struct WEdit *edit_widget, char c, gboolean do_quote) |
733 | 733 | { |
734 | 734 | WPanel *panel = NULL; |
735 | 735 | char *(*quote_func) (const char *, gboolean); |
… |
… |
expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) |
916 | 916 | */ |
917 | 917 | |
918 | 918 | gboolean |
919 | | user_menu_cmd (struct WEdit * edit_widget, const char *menu_file, int selected_entry) |
| 919 | user_menu_cmd (const struct WEdit * edit_widget, const char *menu_file, int selected_entry) |
920 | 920 | { |
921 | 921 | char *p; |
922 | 922 | char *data, **entries; |
diff --git a/src/filemanager/usermenu.h b/src/filemanager/usermenu.h
index c3676e0..cd3afdf 100644
a
|
b
|
struct WEdit; |
19 | 19 | |
20 | 20 | /*** declarations of public functions ************************************************************/ |
21 | 21 | |
22 | | gboolean user_menu_cmd (struct WEdit *edit_widget, const char *menu_file, int selected_entry); |
23 | | char *expand_format (struct WEdit *edit_widget, char c, gboolean do_quote); |
| 22 | gboolean user_menu_cmd (const struct WEdit *edit_widget, const char *menu_file, int selected_entry); |
| 23 | char *expand_format (const struct WEdit *edit_widget, char c, gboolean do_quote); |
24 | 24 | int check_format_view (const char *); |
25 | 25 | int check_format_var (const char *, char **); |
26 | 26 | int check_format_cd (const char *); |
diff --git a/tests/src/filemanager/examine_cd.c b/tests/src/filemanager/examine_cd.c
index b087a91..549e54b 100644
a
|
b
|
quiet_quit_cmd (void) |
71 | 71 | } |
72 | 72 | |
73 | 73 | char * |
74 | | expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) |
| 74 | expand_format (const struct WEdit *edit_widget, char c, gboolean do_quote) |
75 | 75 | { |
76 | 76 | (void) edit_widget; |
77 | 77 | (void) c; |