X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fsnat%2Fsnat_test.c;h=50e81eaec46f74cc1e36d3ebd29f6bd0c018592d;hb=2d23eca3e583cc3408d4fafc3aae6fe5b1109e55;hp=086059a3942735b27bc24172b8eabc58e2da7fb7;hpb=56c7b01e163c233030359781d7e60f4553e90c51;p=vpp.git

diff --git a/src/plugins/snat/snat_test.c b/src/plugins/snat/snat_test.c
index 086059a3942..50e81eaec46 100644
--- a/src/plugins/snat/snat_test.c
+++ b/src/plugins/snat/snat_test.c
@@ -317,6 +317,7 @@ static void vl_api_snat_static_mapping_details_t_handler
 static int api_snat_static_mapping_dump(vat_main_t * vam)
 {
   vl_api_snat_static_mapping_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
   int ret;
 
   if (vam->json_output)
@@ -331,12 +332,11 @@ static int api_snat_static_mapping_dump(vat_main_t * vam)
 
   M(SNAT_STATIC_MAPPING_DUMP, mp);
   S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S(mp);
-  }
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
   W (ret);
   return ret;
 }
@@ -401,6 +401,7 @@ static void vl_api_snat_address_details_t_handler
 static int api_snat_address_dump(vat_main_t * vam)
 {
   vl_api_snat_address_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
   int ret;
 
   if (vam->json_output)
@@ -411,12 +412,11 @@ static int api_snat_address_dump(vat_main_t * vam)
 
   M(SNAT_ADDRESS_DUMP, mp);
   S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S(mp);
-  }
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
   W (ret);
   return ret;
 }
@@ -434,6 +434,7 @@ static void vl_api_snat_interface_details_t_handler
 static int api_snat_interface_dump(vat_main_t * vam)
 {
   vl_api_snat_interface_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
   int ret;
 
   if (vam->json_output)
@@ -444,12 +445,11 @@ static int api_snat_interface_dump(vat_main_t * vam)
 
   M(SNAT_INTERFACE_DUMP, mp);
   S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S(mp);
-  }
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
   W (ret);
   return ret;
 }
@@ -493,6 +493,7 @@ static void vl_api_snat_worker_details_t_handler
 static int api_snat_worker_dump(vat_main_t * vam)
 {
   vl_api_snat_worker_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
   int ret;
 
   if (vam->json_output)
@@ -503,12 +504,11 @@ static int api_snat_worker_dump(vat_main_t * vam)
 
   M(SNAT_WORKER_DUMP, mp);
   S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S(mp);
-  }
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
   W (ret);
   return ret;
 }
@@ -564,6 +564,7 @@ static void vl_api_snat_interface_addr_details_t_handler
 static int api_snat_interface_addr_dump(vat_main_t * vam)
 {
   vl_api_snat_interface_addr_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
   int ret;
 
   if (vam->json_output)
@@ -574,12 +575,11 @@ static int api_snat_interface_addr_dump(vat_main_t * vam)
 
   M(SNAT_INTERFACE_ADDR_DUMP, mp);
   S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S(mp);
-  }
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
   W (ret);
   return ret;
 }