ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename a function and adjust indentation

master
Benno Schulenberg 2016-08-25 20:20:50 +02:00
parent 50616148b0
commit 7e0c4e5726
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/prompt.c
View File

@ -506,7 +506,7 @@ void update_bar_if_needed(void)
} }
/* Get a string of input at the statusbar prompt. */ /* Get a string of input at the statusbar prompt. */
functionptrtype get_prompt_string(int *actual, bool allow_tabs, functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
bool allow_files, bool *listed, bool allow_files, bool *listed,
#endif #endif
@ -546,7 +546,7 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
} }
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x); fprintf(stderr, "acquire_an_answer: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
#endif #endif
update_the_statusbar(); update_the_statusbar();
@ -720,13 +720,13 @@ int do_prompt(bool allow_tabs,
bottombars(menu); bottombars(menu);
while (retval == KEY_WINCH) { while (retval == KEY_WINCH) {
prompt = charalloc((COLS * mb_cur_max()) + 1); prompt = charalloc((COLS * mb_cur_max()) + 1);
va_start(ap, msg); va_start(ap, msg);
vsnprintf(prompt, COLS * mb_cur_max(), msg, ap); vsnprintf(prompt, COLS * mb_cur_max(), msg, ap);
va_end(ap); va_end(ap);
null_at(&prompt, actual_x(prompt, (COLS < 4) ? 0 : COLS - 4)); null_at(&prompt, actual_x(prompt, (COLS < 4) ? 0 : COLS - 4));
func = get_prompt_string(&retval, allow_tabs, func = acquire_an_answer(&retval, allow_tabs,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
allow_files, &listed, allow_files, &listed,
#endif #endif
@ -736,8 +736,8 @@ int do_prompt(bool allow_tabs,
#endif #endif
refresh_func); refresh_func);
free(prompt); free(prompt);
prompt = NULL; prompt = NULL;
} }
/* If we're done with this prompt, restore the x position to what /* If we're done with this prompt, restore the x position to what

9
src/proto.h
View File

@ -518,15 +518,6 @@ void reinit_statusbar_x(void);
void reset_statusbar_cursor(void); void reset_statusbar_cursor(void);
void update_the_statusbar(void); void update_the_statusbar(void);
void update_bar_if_needed(void); void update_bar_if_needed(void);
functionptrtype get_prompt_string(int *value, bool allow_tabs,
#ifndef DISABLE_TABCOMP
bool allow_files, bool *listed,
#endif
const char *curranswer,
#ifndef DISABLE_HISTORIES
filestruct **history_list,
#endif
void (*refresh_func)(void));
int do_prompt(bool allow_tabs, int do_prompt(bool allow_tabs,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
bool allow_files, bool allow_files,