From: Filip Tehlar <ftehlar@cisco.com>
Date: Tue, 7 Feb 2017 12:29:47 +0000 (+0100)
Subject: Fix M(), M2() macros in VAT
X-Git-Tag: v17.04-rc1~248
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=6fa5568fc4b8de0e12a2907de8e1884e984a3520

Fix M(), M2() macros in VAT

Change-Id: I76593632cde97f7cb80bbc395735404f39f3bd3f
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
---

diff --git a/src/vlibapi/vat_helper_macros.h b/src/vlibapi/vat_helper_macros.h
index 57722338e2a..57ad520be1a 100644
--- a/src/vlibapi/vat_helper_macros.h
+++ b/src/vlibapi/vat_helper_macros.h
@@ -45,29 +45,31 @@ do {                                                            \
 #define W(ret)					\
 do {                                            \
     f64 timeout = vat_time_now (vam) + 1.0;     \
+    ret = -99;                                  \
                                                 \
     while (vat_time_now (vam) < timeout) {      \
         if (vam->result_ready == 1) {           \
             ret = vam->retval;                  \
+            break;                              \
         }                                       \
         vat_suspend (vam->vlib_main, 1e-5);     \
     }                                           \
-    ret = -99;                                  \
 } while(0);
 
 /* W2: wait for results, with timeout */
 #define W2(ret, body)				\
 do {                                            \
     f64 timeout = vat_time_now (vam) + 1.0;     \
+    ret = -99;                                  \
                                                 \
     while (vat_time_now (vam) < timeout) {      \
         if (vam->result_ready == 1) {           \
 	  (body);                               \
 	  ret = vam->retval;                    \
+          break;                                \
         }                                       \
         vat_suspend (vam->vlib_main, 1e-5);     \
     }                                           \
-    ret = -99;                                 \
 } while(0);