Grouping the arguments better.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5046 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-07-01 11:50:35 +00:00
parent 645841fd25
commit ebcc68f51d
3 changed files with 7 additions and 15 deletions

View File

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

View File

@ -724,16 +724,13 @@ void total_statusbar_refresh(void (*refresh_func)(void))
const sc *get_prompt_string(int *actual, bool allow_tabs, const sc *get_prompt_string(int *actual, bool allow_tabs,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
bool allow_files, bool allow_files,
bool *list,
#endif #endif
const char *curranswer, const char *curranswer,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
filestruct **history_list, filestruct **history_list,
#endif #endif
void (*refresh_func)(void) void (*refresh_func)(void))
#ifndef DISABLE_TABCOMP
, bool *list
#endif
)
{ {
int kbinput = ERR; int kbinput = ERR;
bool ran_func, finished; bool ran_func, finished;
@ -988,16 +985,13 @@ int do_prompt(bool allow_tabs,
s = get_prompt_string(&retval, allow_tabs, s = get_prompt_string(&retval, allow_tabs,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
allow_files, allow_files,
&list,
#endif #endif
curranswer, curranswer,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
history_list, history_list,
#endif #endif
refresh_func refresh_func);
#ifndef DISABLE_TABCOMP
, &list
#endif
);
free(prompt); free(prompt);
prompt = NULL; prompt = NULL;

View File

@ -525,16 +525,13 @@ void total_statusbar_refresh(void (*refresh_func)(void));
const sc *get_prompt_string(int *value, bool allow_tabs, const sc *get_prompt_string(int *value, bool allow_tabs,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
bool allow_files, bool allow_files,
bool *list,
#endif #endif
const char *curranswer, const char *curranswer,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
filestruct **history_list, filestruct **history_list,
#endif #endif
void (*refresh_func)(void) void (*refresh_func)(void));
#ifndef DISABLE_TABCOMP
, bool *list
#endif
);
int do_prompt(bool allow_tabs, int do_prompt(bool allow_tabs,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
bool allow_files, bool allow_files,