aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-08-27 15:05:27 +0200
committerOle Trøan <otroan@employees.org>2019-08-27 18:04:00 +0000
commit7adaa226eaa2401d6bb0dfd38a0d943c9645d7dc (patch)
tree78ffbde9837497a25971464dcd020f77da6e0ca9 /test
parent2cdcd0cf4004b2c0d1d3b891e381aac5735c21f1 (diff)
api: revert use string type for strings in memclnt.api
This reverts commit 2959d42feb576c0e00c28c4e27658b25f6c783e9. Lacks client side fixes. Type: fix Change-Id: Ib94b18e74325cede41ed1733e57896f17a952526 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test')
-rw-r--r--test/ext/vapi_c_test.c13
-rw-r--r--test/ext/vapi_cpp_test.cpp10
2 files changed, 12 insertions, 11 deletions
diff --git a/test/ext/vapi_c_test.c b/test/ext/vapi_c_test.c
index 6e97b753b23..725f5c30407 100644
--- a/test/ext/vapi_c_test.c
+++ b/test/ext/vapi_c_test.c
@@ -359,14 +359,14 @@ show_version_cb (vapi_ctx_t ctx, void *caller_ctx,
{
ck_assert_int_eq (VAPI_OK, rv);
ck_assert_int_eq (true, is_last);
- ck_assert_str_eq ("vpe", (char *) vl_api_from_api_string (p->program));
+ ck_assert_str_eq ("vpe", (char *) vl_api_from_api_string (&p->program));
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));
+ 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));
++*(int *) caller_ctx;
return VAPI_OK;
}
@@ -803,7 +803,8 @@ generic_cb (vapi_ctx_t ctx, void *callback_ctx, vapi_msg_id_t id, void *msg)
ck_assert_ptr_ne (NULL, msg);
vapi_msg_show_version_reply *reply = msg;
ck_assert_str_eq ("vpe",
- (char *) vl_api_from_api_string (reply->payload.program));
+ (char *) vl_api_from_api_string (&reply->
+ payload.program));
return VAPI_OK;
}
diff --git a/test/ext/vapi_cpp_test.cpp b/test/ext/vapi_cpp_test.cpp
index 589eb94a5ed..46a2c0ec2f1 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;