commit 0c0383df88836b5e072f63c3b3a8f5f6b24c094b
author Paul Vinciguerra <pvinci@vinciconsulting.com> Wed Oct 24 12:14:09 2018 -0700
committer Neale Ranns <nranns@cisco.com> Thu Oct 25 14:30:49 2018 +0000
tree cbe6f73e3de450b279d4c7b956771477e0570ff1
parent 2bfb9e15d8ed7d040de7e453d764a6eb79668f5f

Trivial: Cleanup missing va_ends.

Change-Id: Ie7827b6a31968a355687d27325c0f30cab1bc890
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

src/vnet/fib/fib_test.c

diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c
index 492369c..e26cc67 100644
--- a/src/vnet/fib/fib_test.c
+++ b/src/vnet/fib/fib_test.c
@@ -212,7 +212,8 @@
 #define FIB_TEST_RPF(_cond, _comment, _args...)         \
     {                                                   \
         if (FIB_TEST_I(_cond, _comment, ##_args)) {     \
-            return (1);                                 \
+            res = 1;                                    \
+            goto cleanup;                               \
         }                                               \
     }
 
@@ -258,6 +259,7 @@
 
     dpo_reset(&dpo);
 
+cleanup:
     va_end(ap);
 
     return (res);
@@ -671,7 +673,6 @@
     va_list ap;
     int res;
 
-    va_start(ap, n_buckets);
 
     res = 0;
     pfx = fib_entry_get_prefix(fei);
@@ -682,8 +683,10 @@
     {
         const replicate_t *rep;
 
+        va_start(ap, n_buckets);
         rep = replicate_get(dpo.dpoi_index);
         res = fib_test_validate_rep_v(rep, n_buckets, &ap);
+        va_end (ap);
     }
     else
     {
@@ -694,8 +697,10 @@
                     format_fib_prefix, pfx,
                     format_dpo_type, dpo.dpoi_type);
 
+        va_start(ap, n_buckets);
         lb = load_balance_get(dpo.dpoi_index);
         res = fib_test_validate_lb_v(lb, n_buckets, &ap);
+        va_end(ap);
 
         /*
          * ensure that the LB contributed by the entry is the
@@ -736,8 +741,6 @@
 
     dpo_reset(&dpo);
 
-    va_end(ap);
-
     return (res);
 }