Custom adjacency formatting fix 15/2215/3
authorPierre Pfister <ppfister@cisco.com>
Thu, 4 Aug 2016 13:25:01 +0000 (14:25 +0100)
committerDave Barach <openvpp@barachs.net>
Tue, 9 Aug 2016 18:33:39 +0000 (18:33 +0000)
Looks like something strange is going on with indentation.

Change-Id: I1522caffa3a8a5e3aa00e1169b7469facc505a8d
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
vnet/vnet/ip/lookup.c

index 8531f64..ebf2ba0 100644 (file)
@@ -1045,16 +1045,17 @@ u8 * format_ip_adjacency (u8 * s, va_list * args)
   ip_adj_register_t *reg;
 
   if (adj->lookup_next_index < vec_len (lm->registered_adjacencies))
+  {
+    reg = vec_elt_at_index(lm->registered_adjacencies,
+                           adj->lookup_next_index);
+    if (reg->fn)
     {
-      reg = vec_elt_at_index(lm->registered_adjacencies, 
-                            adj->lookup_next_index);
-      if (reg->fn) 
-       {
-         s = format(s, " %U", reg->fn, lm, adj);
-         goto format_done;
-       }
+      s = format(s, " ");
+      s = reg->fn(s, lm, adj);
+      goto format_done;
     }
-  
+  }
+
   switch (adj->lookup_next_index)
     {
     case IP_LOOKUP_NEXT_REWRITE: