* vtysh.c: Fix warning by casting rl_bind_key 2. argument correctly.

	* extract.pl.in: Fix warning - add isisd/topology to the includes.

diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index b0c13544624052ac3d741f23f1196aa873f74439..9e4e40ad586fbc19bf9cb993d94e7733ee488fba 100644 (file)
--- 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 bab9b14f39ac6205ddeb0033ba9ef7bb500702da..98a9ddde81ec827cebf9b6f7e8e281ddaa8aff60 100755 (executable)
--- 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 13fd9530babdb0ea37e5f5954c14f69110f34641..fa48a44eaaf3606a56a9536d5c84358c61a08bf1 100644 (file)
--- 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