From: Pierre Pfister <ppfister@cisco.com>
Date: Thu, 4 Aug 2016 13:25:01 +0000 (+0100)
Subject: Custom adjacency formatting fix
X-Git-Tag: v16.09-rc1~53
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=ffc7ecace8304217104a5eade163aff5f8903935;p=vpp.git

Custom adjacency formatting fix

Looks like something strange is going on with indentation.

Change-Id: I1522caffa3a8a5e3aa00e1169b7469facc505a8d
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
---

diff --git a/vnet/vnet/ip/lookup.c b/vnet/vnet/ip/lookup.c
index 8531f645629..ebf2ba0cb18 100644
--- a/vnet/vnet/ip/lookup.c
+++ b/vnet/vnet/ip/lookup.c
@@ -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: