nano

commit ebcc68f51d4ccd01484644e8a06f898d2d2fd24d
parent 645841fd253942a0eaa2b048b87a4f2dfd04ef78
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Tue,  1 Jul 2014 11:50:35 +0000

Grouping the arguments better.


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

Diffstat:
M
ChangeLog
 | 
1
+
M
src/prompt.c
 | 
14
++++----------
M
src/proto.h
 | 
7
++-----

3 files changed, 7 insertions(+), 15 deletions(-)
diff --git 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
@@ -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
@@ -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,