]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: fix indentation problems introduced by wrong conflict resolution
authorRenato Westphal <renato@opensourcerouting.org>
Mon, 6 Feb 2017 13:57:34 +0000 (11:57 -0200)
committerRenato Westphal <renato@opensourcerouting.org>
Mon, 6 Feb 2017 14:11:14 +0000 (12:11 -0200)
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
zebra/zserv.c

index e6455862c14bf049b2324218d0a194c1ef6b7b26..6d53c00b29a1f2bb2c2ee5d0dfb248c13fa95777 100644 (file)
@@ -751,28 +751,28 @@ zsend_redistribute_route (int add, struct zserv *client, struct prefix *p,
 
          /* ldpd needs all nexthops */
          if (client->proto != ZEBRA_ROUTE_LDP)
-          break;
+            break;
         }
     }
 
   /* Distance */
-      SET_FLAG (zapi_flags, ZAPI_MESSAGE_DISTANCE);
-      stream_putc (s, rib->distance);
+  SET_FLAG (zapi_flags, ZAPI_MESSAGE_DISTANCE);
+  stream_putc (s, rib->distance);
 
   /* Metric */
-      SET_FLAG (zapi_flags, ZAPI_MESSAGE_METRIC);
-      stream_putl (s, rib->metric);
+  SET_FLAG (zapi_flags, ZAPI_MESSAGE_METRIC);
+  stream_putl (s, rib->metric);
 
   /* Tag */
-      if (rib->tag)
-        {
-          SET_FLAG(zapi_flags, ZAPI_MESSAGE_TAG);
+  if (rib->tag)
+    {
+      SET_FLAG(zapi_flags, ZAPI_MESSAGE_TAG);
       stream_putl(s, rib->tag);
-        }
+    }
 
   /* MTU */
-      SET_FLAG (zapi_flags, ZAPI_MESSAGE_MTU);
-      stream_putl (s, rib->mtu);
+  SET_FLAG (zapi_flags, ZAPI_MESSAGE_MTU);
+  stream_putl (s, rib->mtu);
 
   /* write real message flags value */
   stream_putc_at (s, messmark, zapi_flags);