X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fext%2Fvapi_cpp_test.cpp;h=589eb94a5edc5cb68d6c4880c470f882e5006f13;hb=2959d42fe;hp=68366af2ac8938d0fbe841529c926cf5d4435509;hpb=3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934;p=vpp.git

diff --git a/test/ext/vapi_cpp_test.cpp b/test/ext/vapi_cpp_test.cpp
index 68366af2ac8..589eb94a5ed 100644
--- a/test/ext/vapi_cpp_test.cpp
+++ b/test/ext/vapi_cpp_test.cpp
@@ -49,11 +49,11 @@ void verify_show_version_reply (const Show_version_reply &r)
   auto &p = r.get_payload ();
   printf ("show_version_reply: program: `%s', version: `%s', build directory: "
           "`%s', build date: `%s'\n",
-          vl_api_from_api_string (&p.program),
-          vl_api_from_api_string (&p.version),
-          vl_api_from_api_string (&p.build_directory),
-          vl_api_from_api_string (&p.build_date));
-  ck_assert_str_eq ("vpe", (char *)vl_api_from_api_string (&p.program));
+          vl_api_from_api_string (p.program),
+          vl_api_from_api_string (p.version),
+          vl_api_from_api_string (p.build_directory),
+          vl_api_from_api_string (p.build_date));
+  ck_assert_str_eq ("vpe", (char *)vl_api_from_api_string (p.program));
 }
 
 Connection con;
@@ -151,7 +151,7 @@ START_TEST (test_loopbacks_1)
     Sw_interface_dump d (con);
     auto &p = d.get_request ().get_payload ();
     p.name_filter_valid = 0;
-    memset (p.name_filter, 0, sizeof (p.name_filter));
+    memset (p.name_filter.buf, 0, p.name_filter.length);
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);
@@ -193,7 +193,7 @@ START_TEST (test_loopbacks_1)
     Sw_interface_dump d (con);
     auto &p = d.get_request ().get_payload ();
     p.name_filter_valid = 0;
-    memset (p.name_filter, 0, sizeof (p.name_filter));
+    memset (p.name_filter.buf, 0, p.name_filter.length);
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);
@@ -311,7 +311,7 @@ START_TEST (test_loopbacks_2)
   Sw_interface_dump d (con, std::ref (swdcb));
   auto &p = d.get_request ().get_payload ();
   p.name_filter_valid = 0;
-  memset (p.name_filter, 0, sizeof (p.name_filter));
+  memset (p.name_filter.buf, 0, p.name_filter.length);
   auto rv = d.execute ();
   ck_assert_int_eq (VAPI_OK, rv);
   WAIT_FOR_RESPONSE (d, rv);
@@ -340,7 +340,7 @@ START_TEST (test_loopbacks_2)
     Sw_interface_dump d (con);
     auto &p = d.get_request ().get_payload ();
     p.name_filter_valid = 0;
-    memset (p.name_filter, 0, sizeof (p.name_filter));
+    memset (p.name_filter.buf, 0, p.name_filter.length);
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);