Browse Source

[ripd] bug #278: remove gratuitous use of mid-function declaration

2006-09-11 Paul Jakma <paul.jakma@sun.com>

	* ripd.c: (rip_read) remove gratuitous use of mid-function
	  declaration of vrecv, bug #278.
Paul Jakma 14 years ago
parent
commit
3e557ae1ea
2 changed files with 8 additions and 2 deletions
  1. 5 0
      ripd/ChangeLog
  2. 3 2
      ripd/ripd.c

+ 5 - 0
ripd/ChangeLog

@@ -1,3 +1,8 @@
+2006-09-11 Paul Jakma <paul.jakma@sun.com>
+
+	* ripd.c: (rip_read) remove gratuitous use of mid-function
+	  declaration of vrecv, bug #278.
+
 2006-06-29 Paul Jakma <paul.jakma@sun.com>
 
 	* rip_zebra: (general) convert redistribute commands to use

+ 3 - 2
ripd/ripd.c

@@ -1818,6 +1818,7 @@ rip_read (struct thread *t)
   struct rip_packet *packet;
   struct sockaddr_in from;
   int len;
+  int vrecv;
   socklen_t fromlen;
   struct interface *ifp;
   struct connected *ifc;
@@ -1937,8 +1938,8 @@ rip_read (struct thread *t)
     }
 
   /* RIP Version check. RFC2453, 4.6 and 5.1 */
-  int vrecv = ((ri->ri_receive == RI_RIP_UNSPEC) ?
-               rip->version_recv : ri->ri_receive);
+  vrecv = ((ri->ri_receive == RI_RIP_UNSPEC) ?
+           rip->version_recv : ri->ri_receive);
   if ((packet->version == RIPv1) && !(vrecv & RIPv1))
     {
       if (IS_RIP_DEBUG_PACKET)