diff options
| author |   Jon Loeliger <jdl@netgate.com> | 2017-01-31 15:27:19 -0600 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2017-02-02 17:32:03 +0000 |
| commit | 1f9191f6efa5f2e0284c194f920093201b27ef81 (patch) | |
| tree | f55bd27e2b6d4e25101f650c009c43805d36fd32 /src/vlibapi/vat_helper_macros.h | |
| parent | 7bc770ceb62ede18414b7bb5788692e32477e373 (diff) | |
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>
Diffstat (limited to 'src/vlibapi/vat_helper_macros.h')
| -rw-r--r-- | src/vlibapi/vat_helper_macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vlibapi/vat_helper_macros.h b/src/vlibapi/vat_helper_macros.h index 172fe2db4a8..ffb74fe3b9b 100644 --- a/src/vlibapi/vat_helper_macros.h +++ b/src/vlibapi/vat_helper_macros.h @@ -44,7 +44,7 @@ do { \ /* 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 @@ do { \ /* 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) { \ |