X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=40e2a801da63ca01f3d37d062655f262f5147fdf;hb=2a022368f4b37559de5d5621a88c648023493f75;hp=b18959ad6c99444b457d713d0c310f85fcc134c0;hpb=1089aab7136612acb86cdcd638d7d2261311531a;p=sliver-openvswitch.git

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index b18959ad6..40e2a801d 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -107,7 +107,6 @@ main(int argc, char *argv[])
     for (i = optind; i < argc; i++) {
         const char *name = argv[i];
         struct vconn *vconn;
-        int retval;
 
         retval = vconn_open(name, OFP_VERSION, &vconn);
         if (!retval) {
@@ -146,12 +145,10 @@ main(int argc, char *argv[])
 
     while (n_switches > 0 || n_listeners > 0) {
         int iteration;
-        int i;
 
         /* Accept connections on listening vconns. */
         for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) {
             struct vconn *new_vconn;
-            int retval;
 
             retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
             if (!retval || retval == EAGAIN) {
@@ -171,7 +168,8 @@ main(int argc, char *argv[])
             bool progress = false;
             for (i = 0; i < n_switches; ) {
                 struct switch_ *this = &switches[i];
-                int retval = do_switching(this);
+
+                retval = do_switching(this);
                 if (!retval || retval == EAGAIN) {
                     if (!retval) {
                         progress = true;