diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-03-06 16:04:19 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-03-06 17:28:40 +0100 |
| commit | 216c57eed72fee52e99bb5d014c9de535e631f58 (patch) | |
| tree | 4dffc9fc7fd74e1156c7d5f1506c5f2017e0e6ae | |
| parent | 061acd177f4572f75107bac6a2f7379a55ceec93 (diff) | |
| download | lvm2-216c57eed72fee52e99bb5d014c9de535e631f58.tar.gz | |
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>
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | tools/lvm.c | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -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. diff --git a/tools/lvm.c b/tools/lvm.c index 51e92932a..f9ab438b2 100644 --- a/tools/lvm.c +++ b/tools/lvm.c @@ -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); |