summaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@netgate.com>2017-02-01 12:31:41 -0600
committerDave Barach <openvpp@barachs.net>2017-02-02 17:32:27 +0000
commit56c7b01e163c233030359781d7e60f4553e90c51 (patch)
tree6d6ce1f179fdbfa2c2919ac082984fd0bf426f7f /src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
parent1f9191f6efa5f2e0284c194f920093201b27ef81 (diff)
Refactor fragile msg macro W and W2 to not burry return control flow.
Instead, have them accept and assign a return paramter leaving the return control flow up to the caller. Clean up otherwise misleading returns present even after "NOT REACHED" comments. Change-Id: I0861921f73ab65d55b95eabd27514f0129152723 Signed-off-by: Jon Loeliger <jdl@netgate.com>
Diffstat (limited to 'src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c')
-rw-r--r--src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c36
1 files changed, 18 insertions, 18 deletions
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 3e7300f5dd2..80e656448c6 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c
@@ -108,6 +108,7 @@ api_vxlan_gpe_ioam_enable (vat_main_t * vam)
int has_trace_option = 0;
int has_pow_option = 0;
int has_ppc_option = 0;
+ int ret;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
@@ -132,9 +133,8 @@ api_vxlan_gpe_ioam_enable (vat_main_t * vam)
S (mp);
- W;
-
- return (0);
+ W (ret);
+ return ret;
}
@@ -142,11 +142,12 @@ static int
api_vxlan_gpe_ioam_disable (vat_main_t * vam)
{
vl_api_vxlan_gpe_ioam_disable_t *mp;
+ int ret;
M (VXLAN_GPE_IOAM_DISABLE, mp);
S (mp);
- W;
- return 0;
+ W (ret);
+ return ret;
}
static int
@@ -161,6 +162,7 @@ api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam)
u8 remote_set = 0;
u32 vni;
u8 vni_set = 0;
+ int ret;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
@@ -238,9 +240,8 @@ api_vxlan_gpe_ioam_vni_enable (vat_main_t * vam)
mp->is_ipv6 = ipv6_set;
S (mp);
- W;
-
- return (0);
+ W (ret);
+ return ret;
}
static int
@@ -255,6 +256,7 @@ api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam)
u8 remote_set = 0;
u32 vni;
u8 vni_set = 0;
+ int ret;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
@@ -332,9 +334,8 @@ api_vxlan_gpe_ioam_vni_disable (vat_main_t * vam)
mp->is_ipv6 = ipv6_set;
S (mp);
- W;
-
- return 0;
+ W (ret);
+ return ret;
}
static int
@@ -347,6 +348,7 @@ 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;
+ int ret;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
@@ -401,9 +403,8 @@ api_vxlan_gpe_ioam_transit_enable (vat_main_t * vam)
mp->is_ipv6 = ipv6_set;
S (mp);
- W;
-
- return (0);
+ W (ret);
+ return ret;
}
static int
@@ -416,6 +417,7 @@ 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;
+ int ret;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
@@ -469,10 +471,8 @@ api_vxlan_gpe_ioam_transit_disable (vat_main_t * vam)
mp->is_ipv6 = ipv6_set;
S (mp);
- W;
-
-
- return (0);
+ W (ret);
+ return ret;
}
/*