[src/trunk]: src/lib/libedit Align types with readline-8.2 (wiz@)

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d45591f13692
branches:  trunk
changeset: 374359:d45591f13692
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 21 14:56:13 2023 +0000

description:
Align types with readline-8.2 (wiz@)

diffstat:

 lib/libedit/readline.c          |  14 +++++++-------
 lib/libedit/readline/readline.h |  15 ++++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

diffs (82 lines):

diff -r 37a0ead151b4 -r d45591f13692 lib/libedit/readline.c
--- a/lib/libedit/readline.c    Fri Apr 21 02:17:32 2023 +0000
+++ b/lib/libedit/readline.c    Fri Apr 21 14:56:13 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readline.c,v 1.178 2022/12/02 19:23:15 christos Exp $  */
+/*     $NetBSD: readline.c,v 1.179 2023/04/21 14:56:13 christos Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.178 2022/12/02 19:23:15 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.179 2023/04/21 14:56:13 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <sys/types.h>
@@ -122,11 +122,11 @@ int rl_filename_completion_desired = 0;
 int rl_ignore_completion_duplicates = 0;
 int readline_echoing_p = 1;
 int _rl_print_completions_horizontally = 0;
-VFunction *rl_redisplay_function = NULL;
+rl_voidfunc_t *rl_redisplay_function = NULL;
 rl_hook_func_t *rl_startup_hook = NULL;
-VFunction *rl_completion_display_matches_hook = NULL;
-VFunction *rl_prep_term_function = (VFunction *)rl_prep_terminal;
-VFunction *rl_deprep_term_function = (VFunction *)rl_deprep_terminal;
+rl_compdisp_func_t *rl_completion_display_matches_hook = NULL;
+rl_vintfunc_t *rl_prep_term_function = (rl_vintfunc_t *)rl_prep_terminal;
+rl_voidfunc_t *rl_deprep_term_function = (rl_voidfunc_t *)rl_deprep_terminal;
 KEYMAP_ENTRY_ARRAY emacs_meta_keymap;
 unsigned long rl_readline_state = RL_STATE_NONE;
 int _rl_complete_mark_directories;
@@ -2573,7 +2573,7 @@ void
 rl_reset_after_signal(void)
 {
        if (rl_prep_term_function)
-               (*rl_prep_term_function)();
+               (*rl_prep_term_function)(1);
 }
 
 void
diff -r 37a0ead151b4 -r d45591f13692 lib/libedit/readline/readline.h
--- a/lib/libedit/readline/readline.h   Fri Apr 21 02:17:32 2023 +0000
+++ b/lib/libedit/readline/readline.h   Fri Apr 21 14:56:13 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readline.h,v 1.53 2022/02/19 17:45:02 christos Exp $   */
+/*     $NetBSD: readline.h,v 1.54 2023/04/21 14:56:13 christos Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,11 +38,12 @@
 
 /* typedefs */
 typedef int      Function(const char *, int);
-typedef char     *CPFunction(const char *, int);
-typedef void     VFunction(void);
+typedef void     rl_voidfunc_t(void);
+typedef void     rl_vintfunc_t(int);
 typedef void     rl_vcpfunc_t(char *);
 typedef char   **rl_completion_func_t(const char *, int, int);
 typedef char     *rl_compentry_func_t(const char *, int);
+typedef void     rl_compdisp_func_t(char **, int, int);
 typedef int      rl_command_func_t(int, int);
 typedef int      rl_hook_func_t(void);
 typedef int       rl_icppfunc_t(char **);
@@ -145,10 +146,10 @@ extern KEYMAP_ENTRY_ARRAY emacs_standard
 extern int             rl_filename_completion_desired;
 extern int             rl_ignore_completion_duplicates;
 extern int             (*rl_getc_function)(FILE *);
-extern VFunction       *rl_redisplay_function;
-extern VFunction       *rl_completion_display_matches_hook;
-extern VFunction       *rl_prep_term_function;
-extern VFunction       *rl_deprep_term_function;
+extern rl_voidfunc_t   *rl_redisplay_function;
+extern rl_compdisp_func_t *rl_completion_display_matches_hook;
+extern rl_vintfunc_t   *rl_prep_term_function;
+extern rl_voidfunc_t   *rl_deprep_term_function;
 extern rl_hook_func_t  *rl_event_hook;
 extern int             readline_echoing_p;
 extern int             _rl_print_completions_horizontally;