From a9d4247c093132db42bde74a144b07222e4499d3 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Thu, 30 Nov 2017 18:20:29 +0100 Subject: [PATCH] Minor, header cleanup, whitespace fixes, comments Signed-off-by: Joachim Nilsson --- include/editline.h | 34 +++++++++++++++++----------------- src/editline.c | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/editline.h b/include/editline.h index 0ccf726..6fc7d56 100644 --- a/include/editline.h +++ b/include/editline.h @@ -80,30 +80,30 @@ extern int el_no_echo; /* E.g under emacs, don't echo except prompt */ extern int el_no_hist; /* Disable auto-save of and access to history -- e.g. for password prompts or wizards */ extern int el_hist_size; /* size of history scrollback buffer, default: 15 */ -extern void rl_initialize(void); -extern void rl_reset_terminal(const char *terminal_name); -extern void rl_uninitialize(void); +extern void rl_initialize (void); +extern void rl_reset_terminal (const char *terminal_name); +extern void rl_uninitialize (void); -void rl_save_prompt(void); -void rl_restore_prompt(void); -void rl_set_prompt(const char *prompt); +extern void rl_save_prompt (void); +extern void rl_restore_prompt (void); +extern void rl_set_prompt (const char *prompt); -void rl_clear_message(void); -void rl_forced_update_display(void); +extern void rl_clear_message (void); +extern void rl_forced_update_display(void); -extern char *readline(const char *prompt); -extern void add_history(const char *line); +extern void rl_prep_terminal (int meta_flag); +extern void rl_deprep_terminal (void); -extern int read_history(const char *filename); -extern int write_history(const char *filename); +extern int rl_getc(void); -rl_complete_func_t *rl_set_complete_func(rl_complete_func_t *func); -rl_list_possib_func_t *rl_set_list_possib_func(rl_list_possib_func_t *func); +extern char *readline (const char *prompt); -void rl_prep_terminal(int meta_flag); -void rl_deprep_terminal(void); +extern void add_history (const char *line); +extern int read_history (const char *filename); +extern int write_history (const char *filename); -int rl_getc(void); +extern rl_complete_func_t *rl_set_complete_func (rl_complete_func_t *func); +extern rl_list_possib_func_t *rl_set_list_possib_func (rl_list_possib_func_t *func); #ifdef __cplusplus } diff --git a/src/editline.c b/src/editline.c index 02517fe..da3e234 100644 --- a/src/editline.c +++ b/src/editline.c @@ -61,11 +61,14 @@ typedef struct { char **Lines; } el_hist_t; +/* User definable callbacks. */ rl_getc_func_t *rl_getc_function = rl_getc; rl_hook_func_t *rl_event_hook; rl_vintfunc_t *rl_prep_term_function = rl_prep_terminal; rl_voidfunc_t *rl_deprep_term_function = rl_deprep_terminal; +char **(*rl_attempted_completion_function)(const char *token, int start, int end); + /* ** Globals. */ @@ -121,9 +124,6 @@ const char *rl_readline_name = NULL; /* Set by calling program, for condit FILE *rl_instream = NULL; /* The stdio stream from which input is read. Defaults to stdin if NULL */ FILE *rl_outstream = NULL; /* The stdio stream to which output is flushed. Defaults to stdout if NULL */ -/* User definable callbacks. */ -char **(*rl_attempted_completion_function)(const char *token, int start, int end); - /* Declarations. */ static char *editinput(void); #ifdef CONFIG_USE_TERMCAP