commit 1f9191f6efa5f2e0284c194f920093201b27ef81
author Jon Loeliger <jdl@netgate.com> Tue Jan 31 15:27:19 2017 -0600
committer Dave Barach <openvpp@barachs.net> Thu Feb 02 17:32:03 2017 +0000
tree f55bd27e2b6d4e25101f650c009c43805d36fd32
parent 7bc770ceb62ede18414b7bb5788692e32477e373

Localize the timeout variable within the W message macro.

Rather than rely on an unbound variable, explicitly introduce
the timeout variable within the 'do { ... } while (0)' construct
as a block-local variable.

Change-Id: I6e78635290f9b5ab3f56b7f116c5fa762c88c9e9
Signed-off-by: Jon Loeliger <jdl@netgate.com>

src/vlibapi/vat_helper_macros.h

diff --git a/src/vlibapi/vat_helper_macros.h b/src/vlibapi/vat_helper_macros.h
index 172fe2d..ffb74fe 100644
--- a/src/vlibapi/vat_helper_macros.h
+++ b/src/vlibapi/vat_helper_macros.h
@@ -44,7 +44,7 @@
 /* W: wait for results, with timeout */
 #define W                                       \
 do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
+    f64 timeout = vat_time_now (vam) + 1.0;     \
                                                 \
     while (vat_time_now (vam) < timeout) {      \
         if (vam->result_ready == 1) {           \
@@ -58,7 +58,7 @@
 /* W2: wait for results, with timeout */
 #define W2(body)                                \
 do {                                            \
-    timeout = vat_time_now (vam) + 1.0;         \
+    f64 timeout = vat_time_now (vam) + 1.0;     \
                                                 \
     while (vat_time_now (vam) < timeout) {      \
         if (vam->result_ready == 1) {           \