Module Name: src
Committed By: christos
Date: Fri Apr 21 14:56:13 UTC 2023
Modified Files:
src/lib/libedit: readline.c
src/lib/libedit/readline: readline.h
Log Message:
Align types with readline-8.2 (wiz@)
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/lib/libedit/readline.c
cvs rdiff -u -r1.53 -r1.54 src/lib/libedit/readline/readline.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.178 src/lib/libedit/readline.c:1.179
--- src/lib/libedit/readline.c:1.178 Fri Dec 2 14:23:15 2022
+++ src/lib/libedit/readline.c Fri Apr 21 10:56:13 2023
@@ -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
Index: src/lib/libedit/readline/readline.h
diff -u src/lib/libedit/readline/readline.h:1.53 src/lib/libedit/readline/readline.h:1.54
--- src/lib/libedit/readline/readline.h:1.53 Sat Feb 19 12:45:02 2022
+++ src/lib/libedit/readline/readline.h Fri Apr 21 10:56:13 2023
@@ -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;
