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>
This commit is contained in:
Jon Loeliger
2017-01-31 15:27:19 -06:00
committed by Dave Barach
parent 7bc770ceb6
commit 1f9191f6ef
12 changed files with 6 additions and 231 deletions

View File

@ -133,7 +133,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) { \\
@ -147,7 +147,6 @@ static int api_" plugin-name "_enable_disable (vat_main_t * vam)
{
" plugin-name "_test_main_t * sm = &" plugin-name "_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
int enable_disable = 1;
u32 sw_if_index = ~0;
vl_api_" plugin-name "_enable_disable_t * mp;