Fixup of some last remaining differences between stg and git

diff --git a/lib/vty.c b/lib/vty.c
index 54bbef65a9800fe1c92829907503c01591ffe5e8..7ced104014ef7c930a4e6f24614386cd2aa82bec 100644 (file)
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2399,7 +2399,7 @@ vty_read_config (char *config_file,
         {
           fprintf (stderr, "%s: failed to open configuration file %s: %s\n",
                    __func__, config_default_dir, safe_strerror (errno));
-
+          
           confp = vty_use_backup_config (config_default_dir);
           if (confp)
             {
@@ -2409,10 +2409,10 @@ vty_read_config (char *config_file,
           else
             {
               fprintf (stderr, "can't open configuration file [%s]\n",
-                      config_default_dir);
-             exit (1);
+                                config_default_dir);
+                 exit (1);
             }
-        }
+        }      
       else
         fullpath = config_default_dir;
     }

diff --git a/ripd/ripd.c b/ripd/ripd.c
index 8c0470e64e1fc98091093b49de0e889209732376..ee7dfc3cba7610c358d0c788f786b19355947edb 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -2159,7 +2159,7 @@ rip_output_process (struct connected *ifc, struct sockaddr_in *to,
 
   /* Reset stream and RTE counter. */
   stream_reset (s);
-  rtemax = RIP_MAX_RTE;
+  rtemax = (RIP_PACKET_MAXSIZ - 4) / 20;
 
   /* Get RIP interface. */
   ri = ifc->ifp->info;

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index b1c9f453b6cc11e773f0bef8b2c46a6882abc9c8..bf2d01ca207bccb5de9b7ef145f4a69aa2cf3737 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2020,6 +2020,7 @@ backup_config_file (const char *fbackup)
 static int
 write_config_integrated(void)
 {
+  int ret;
   u_int i;
   char line[] = "write terminal\n";
   FILE *fp, *fp1;

diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c
index 27a5fdf98f2ffe72bfac1862c1cafb1cf9be37ea..a17f7a7176187abd8141e8441bd0ad2027b90eed 100644 (file)
--- a/vtysh/vtysh_user.c
+++ b/vtysh/vtysh_user.c
@@ -38,9 +38,6 @@
 #include "linklist.h"
 #include "command.h"
 
-extern struct list *config_top;
-extern void config_add_line(struct list *config, const char *line);
-
 /* 
  * Compiler is warning about prototypes not being declared.
  * The DEFUNSH and DEFUN macro's are messing with the