mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
readline: switch to new-style readline typedef
Based on patch: https://www.redhat.com/archives/lvm-devel/2014-March/msg00015.html The CPPFunction typedef (among others) have been deprecated in favour of specific prototyped typedefs since readline 4.2 (circa 2001). It's been working since because compatibility typedefs have been in place until they where removed in the recent readline 6.3 release. Switch to the new style to avoid build breakage. But also add full backward compatibility with define. Signed-off-by: Gustavo Zacarias <gustavo zacarias com ar>
This commit is contained in:
parent
061acd177f
commit
216c57eed7
@ -1,5 +1,6 @@
|
||||
Version 2.02.106 -
|
||||
====================================
|
||||
Use correct rl_completion_func_t typedef for new readline.
|
||||
Make lvm 'dumpconfig --type default' complete for it to be consumed by lvm.
|
||||
Run pvscan --cache via systemd-run in udev if the PV label is detected lost.
|
||||
Fix memleak when lvmetad discovers PV to appear on another device.
|
||||
|
@ -27,6 +27,7 @@ int main(int argc, char **argv)
|
||||
# include <readline/history.h>
|
||||
# ifndef HAVE_RL_COMPLETION_MATCHES
|
||||
# define rl_completion_matches(a, b) completion_matches((char *)a, b)
|
||||
# define rl_completion_func_t CPPFunction
|
||||
# endif
|
||||
|
||||
static struct cmdline_context *_cmdline;
|
||||
@ -185,7 +186,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
|
||||
char *input = NULL, *args[MAX_ARGS], **argv;
|
||||
|
||||
rl_readline_name = "lvm";
|
||||
rl_attempted_completion_function = (CPPFunction *) _completion;
|
||||
rl_attempted_completion_function = (rl_completion_func_t *) _completion;
|
||||
|
||||
_read_history(cmd);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user