summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vtysh/ChangeLog5
-rwxr-xr-xvtysh/extract.pl.in2
-rw-r--r--vtysh/vtysh.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index b0c13544..9e4e40ad 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-15 Hasso Tepper <hasso at quagga.net>
+
+ * vtysh.c: Fix warning by casting rl_bind_key 2. argument correctly.
+ * extract.pl.in: Fix warning - add isisd/topology to the includes.
+
2005-08-22 Hugo Santos <hsantos@av.it.pt>
* vtysh.c: Add support for BGP_IPV6M_NODE
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index bab9b14f..98a9ddde 100755
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -62,7 +62,7 @@ $ignore{'"show history"'} = "ignore";
foreach (@ARGV) {
$file = $_;
- open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib @SNMP_INCLUDES@ $file |");
+ open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ $file |");
local $/; undef $/;
$line = <FH>;
close (FH);
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 13fd9530..fa48a44e 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2099,7 +2099,7 @@ void
vtysh_readline_init (void)
{
/* readline related settings. */
- rl_bind_key ('?', vtysh_rl_describe);
+ rl_bind_key ('?', (Function *) vtysh_rl_describe);
rl_completion_entry_function = vtysh_completion_entry_function;
rl_attempted_completion_function = (CPPFunction *)new_completion;
/* do not append space after completion. It will be appended