From 56c7b01e163c233030359781d7e60f4553e90c51 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Wed, 1 Feb 2017 12:31:41 -0600 Subject: 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 --- src/examples/sample-plugin/sample/sample_test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/examples/sample-plugin') diff --git a/src/examples/sample-plugin/sample/sample_test.c b/src/examples/sample-plugin/sample/sample_test.c index bf7a0590..6dd3a3e8 100644 --- a/src/examples/sample-plugin/sample/sample_test.c +++ b/src/examples/sample-plugin/sample/sample_test.c @@ -98,6 +98,7 @@ static int api_sample_macswap_enable_disable (vat_main_t * vam) int enable_disable = 1; u32 sw_if_index = ~0; vl_api_sample_macswap_enable_disable_t * mp; + int ret; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -125,7 +126,8 @@ static int api_sample_macswap_enable_disable (vat_main_t * vam) S(mp); /* Wait for a reply... */ - W; + W (ret); + return ret; } /* -- cgit 1.2.3-korg