Fixes for 'make UNATTENDED=yes CC=clang CXX=clang verify'

Change-Id: I994649761fe2e66e12ae0e49a84fb1d0a966ddfb
Signed-off-by: Neale Ranns <nranns@cisco.com>
diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c
index 5981a3c..5aa9b92 100644
--- a/src/vnet/ip/ip4_mtrie.c
+++ b/src/vnet/ip/ip4_mtrie.c
@@ -755,8 +755,8 @@
     {
       if (ip4_fib_mtrie_leaf_is_non_empty (p, i))
 	{
-	  FORMAT_PLY (s, p, i, base_address,
-		      p->dst_address_bits_base + 8, indent);
+	  s = FORMAT_PLY (s, p, i, base_address,
+			  p->dst_address_bits_base + 8, indent);
 	}
     }
 
@@ -791,7 +791,7 @@
 
 	  if (p->dst_address_bits_of_leaves[slot] > 0)
 	    {
-	      FORMAT_PLY (s, p, slot, base_address, 16, 2);
+	      s = FORMAT_PLY (s, p, slot, base_address, 16, 2);
 	    }
 	}
     }