From 1f9191f6efa5f2e0284c194f920093201b27ef81 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Tue, 31 Jan 2017 15:27:19 -0600 Subject: 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 --- src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c | 1 - src/plugins/ioam/export/ioam_export_test.c | 1 - src/plugins/ioam/lib-pot/pot_test.c | 4 ---- src/plugins/ioam/lib-trace/trace_test.c | 4 +--- src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c | 6 ------ 5 files changed, 1 insertion(+), 15 deletions(-) (limited to 'src/plugins/ioam') diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c index 161b5241..a7938219 100644 --- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c +++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c @@ -92,7 +92,6 @@ static int api_vxlan_gpe_ioam_export_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - f64 timeout; int is_disable = 0; vl_api_vxlan_gpe_ioam_export_enable_disable_t *mp; diff --git a/src/plugins/ioam/export/ioam_export_test.c b/src/plugins/ioam/export/ioam_export_test.c index 45c4ca56..2cb036a5 100644 --- a/src/plugins/ioam/export/ioam_export_test.c +++ b/src/plugins/ioam/export/ioam_export_test.c @@ -94,7 +94,6 @@ static int api_ioam_export_ip6_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - f64 timeout; int is_disable = 0; vl_api_ioam_export_ip6_enable_disable_t *mp; diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c index 4f049be8..d896eb2f 100644 --- a/src/plugins/ioam/lib-pot/pot_test.c +++ b/src/plugins/ioam/lib-pot/pot_test.c @@ -132,7 +132,6 @@ static int api_pot_profile_add (vat_main_t *vam) u64 secret_key = 0; u32 bits = MAX_BITS; u64 lpc = 0, poly2 = 0; - f64 timeout; u8 id = 0; int rv = 0; @@ -204,7 +203,6 @@ static int api_pot_profile_activate (vat_main_t *vam) u8 *name = NULL; u8 id = 0; int rv = 0; - f64 timeout; while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) { @@ -241,7 +239,6 @@ OUT: static int api_pot_profile_del (vat_main_t *vam) { vl_api_pot_profile_del_t *mp; - f64 timeout; M(POT_PROFILE_DEL, mp); mp->list_name_len = 0; @@ -254,7 +251,6 @@ static int api_pot_profile_show_config_dump (vat_main_t *vam) { unformat_input_t *input = vam->input; vl_api_pot_profile_show_config_dump_t *mp; - f64 timeout; u8 id = 0; while(unformat_check_input(input) != UNFORMAT_END_OF_INPUT) diff --git a/src/plugins/ioam/lib-trace/trace_test.c b/src/plugins/ioam/lib-trace/trace_test.c index 5093f330..d1fb7205 100644 --- a/src/plugins/ioam/lib-trace/trace_test.c +++ b/src/plugins/ioam/lib-trace/trace_test.c @@ -129,7 +129,6 @@ api_trace_profile_add (vat_main_t * vam) u32 node_id = 0; u32 app_data = 0; u8 trace_tsp = 0; - f64 timeout; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -169,7 +168,6 @@ static int api_trace_profile_del (vat_main_t * vam) { vl_api_trace_profile_del_t *mp; - f64 timeout; M (TRACE_PROFILE_DEL, mp); S (mp); @@ -181,7 +179,7 @@ static int api_trace_profile_show_config (vat_main_t * vam) { vl_api_trace_profile_show_config_t *mp; - f64 timeout; + M (TRACE_PROFILE_SHOW_CONFIG, mp); S (mp); W; diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c index ee25a874..3e7300f5 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c +++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c @@ -104,7 +104,6 @@ api_vxlan_gpe_ioam_enable (vat_main_t * vam) { unformat_input_t *input = vam->input; vl_api_vxlan_gpe_ioam_enable_t *mp; - f64 timeout; u32 id = 0; int has_trace_option = 0; int has_pow_option = 0; @@ -143,7 +142,6 @@ static int api_vxlan_gpe_ioam_disable (vat_main_t * vam) { vl_api_vxlan_gpe_ioam_disable_t *mp; - f64 timeout; M (VXLAN_GPE_IOAM_DISABLE, mp); S (mp); @@ -163,7 +161,6 @@ api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam) u8 remote_set = 0; u32 vni; u8 vni_set = 0; - f64 timeout; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) @@ -258,7 +255,6 @@ api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam) u8 remote_set = 0; u32 vni; u8 vni_set = 0; - f64 timeout; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) @@ -351,7 +347,6 @@ api_vxlan_gpe_ioam_transit_enable (vat_main_t * vam) u8 ipv4_set = 0, ipv6_set = 0; u8 local_set = 0; u32 outer_fib_index = 0; - f64 timeout; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) @@ -421,7 +416,6 @@ api_vxlan_gpe_ioam_transit_disable (vat_main_t * vam) u8 ipv4_set = 0, ipv6_set = 0; u8 local_set = 0; u32 outer_fib_index = 0; - f64 timeout; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) -- cgit 1.2.3-korg