Grouping the arguments better.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5046 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 0ef3d6f0f3ac47104d964b86fcd56f7baadf73c7..13b64702727a6b4056cfb206a7931d4864db621f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        no tagless functions, so there is no need to check.
        * src/prompt.c (do_prompt, get_prompt_string): Don't pass the
        menu, just set it earlier.
+       * src/prompt.c (get_prompt_string): Group the arguments better.
 
 2014-06-30  Mark Majeres  <mark@engine12.com>
        * src/cut.c, src/global.c, src/nano.c: Rename 'cut_till_end' to

diff --git a/src/prompt.c b/src/prompt.c
index 6aa539edb3ebe40e145574502a6845325f67d2c5..719f21541fc435290c8b8164f138623e4ff0ac51 100644 (file)
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -724,16 +724,13 @@ void total_statusbar_refresh(void (*refresh_func)(void))
 const sc *get_prompt_string(int *actual, bool allow_tabs,
 #ifndef DISABLE_TABCOMP
        bool allow_files,
+       bool *list,
 #endif
        const char *curranswer,
 #ifndef DISABLE_HISTORIES
        filestruct **history_list,
 #endif
-       void (*refresh_func)(void)
-#ifndef DISABLE_TABCOMP
-       , bool *list
-#endif
-       )
+       void (*refresh_func)(void))
 {
     int kbinput = ERR;
     bool ran_func, finished;
@@ -988,16 +985,13 @@ int do_prompt(bool allow_tabs,
     s = get_prompt_string(&retval, allow_tabs,
 #ifndef DISABLE_TABCOMP
        allow_files,
+       &list,
 #endif
        curranswer,
 #ifndef DISABLE_HISTORIES
        history_list,
 #endif
-       refresh_func
-#ifndef DISABLE_TABCOMP
-       , &list
-#endif
-       );
+       refresh_func);
 
     free(prompt);
     prompt = NULL;

diff --git a/src/proto.h b/src/proto.h
index 4ee11eccf87a70bf3020cfba20ef4bc25ad50997..3fa197aa6109be1f1ba8887b6bef49ad53e8297c 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -525,16 +525,13 @@ void total_statusbar_refresh(void (*refresh_func)(void));
 const sc *get_prompt_string(int *value, bool allow_tabs,
 #ifndef DISABLE_TABCOMP
        bool allow_files,
+       bool *list,
 #endif
        const char *curranswer,
 #ifndef DISABLE_HISTORIES
        filestruct **history_list,
 #endif
-       void (*refresh_func)(void)
-#ifndef DISABLE_TABCOMP
-       , bool *list
-#endif
-       );
+       void (*refresh_func)(void));
 int do_prompt(bool allow_tabs,
 #ifndef DISABLE_TABCOMP
        bool allow_files,