summaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam/lib-pot
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-pot
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-pot')
-rw-r--r--src/plugins/ioam/lib-pot/pot_test.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c
index d896eb2ff88..1c6dd02dae1 100644
--- a/src/plugins/ioam/lib-pot/pot_test.c
+++ b/src/plugins/ioam/lib-pot/pot_test.c
@@ -134,6 +134,7 @@ static int api_pot_profile_add (vat_main_t *vam)
u64 lpc = 0, poly2 = 0;
u8 id = 0;
int rv = 0;
+ int ret;
while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
{
@@ -188,7 +189,8 @@ static int api_pot_profile_add (vat_main_t *vam)
mp->max_bits = bits;
S(mp);
- W;
+ W (ret);
+ return ret;
OUT:
vec_free(name);
@@ -203,6 +205,7 @@ static int api_pot_profile_activate (vat_main_t *vam)
u8 *name = NULL;
u8 id = 0;
int rv = 0;
+ int ret;
while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
{
@@ -228,7 +231,8 @@ static int api_pot_profile_activate (vat_main_t *vam)
mp->id = id;
S(mp);
- W;
+ W (ret);
+ return ret;
OUT:
vec_free(name);
@@ -239,12 +243,13 @@ OUT:
static int api_pot_profile_del (vat_main_t *vam)
{
vl_api_pot_profile_del_t *mp;
+ int ret;
M(POT_PROFILE_DEL, mp);
mp->list_name_len = 0;
S(mp);
- W;
- return 0;
+ W (ret);
+ return ret;
}
static int api_pot_profile_show_config_dump (vat_main_t *vam)
@@ -252,6 +257,7 @@ 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;
u8 id = 0;
+ int ret;
while(unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
{
@@ -264,8 +270,8 @@ static int api_pot_profile_show_config_dump (vat_main_t *vam)
mp->id = id;
S(mp);
- W;
- return 0;
+ W (ret);
+ return ret;
}
/*