liblttng-ctl: use lttng_payload for serialize/create_from_buffer

[lttng-tools.git] / src / common / actions / stop-session.c

diff --git a/src/common/actions/stop-session.c b/src/common/actions/stop-session.c
index a36e873cf94cf7797551dc0a2f1ed72ec2ce4d52..33077b6766d0773ca9ed0ddf87b6072e7bf1794c 100644 (file)
--- a/src/common/actions/stop-session.c
+++ b/src/common/actions/stop-session.c
@@ -96,7 +96,7 @@ end:
 }
 
 static int lttng_action_stop_session_serialize(
-               struct lttng_action *action, struct lttng_dynamic_buffer *buf)
+               struct lttng_action *action, struct lttng_payload *payload)
 {
        struct lttng_action_stop_session *action_stop_session;
        struct lttng_action_stop_session_comm comm;
@@ -104,7 +104,7 @@ static int lttng_action_stop_session_serialize(
        int ret;
 
        assert(action);
-       assert(buf);
+       assert(payload);
 
        action_stop_session = action_stop_session_from_action(action);
 
@@ -116,13 +116,14 @@ static int lttng_action_stop_session_serialize(
        session_name_len = strlen(action_stop_session->session_name) + 1;
        comm.session_name_len = session_name_len;
 
-       ret = lttng_dynamic_buffer_append(buf, &comm, sizeof(comm));
+       ret = lttng_dynamic_buffer_append(
+                       &payload->buffer, &comm, sizeof(comm));
        if (ret) {
                ret = -1;
                goto end;
        }
 
-       ret = lttng_dynamic_buffer_append(buf,
+       ret = lttng_dynamic_buffer_append(&payload->buffer,
                        action_stop_session->session_name, session_name_len);
        if (ret) {
                ret = -1;
@@ -151,8 +152,8 @@ end:
        return;
 }
 
-ssize_t lttng_action_stop_session_create_from_buffer(
-               const struct lttng_buffer_view *view,
+ssize_t lttng_action_stop_session_create_from_payload(
+               struct lttng_payload_view *view,
                struct lttng_action **p_action)
 {
        ssize_t consumed_len;
@@ -167,11 +168,11 @@ ssize_t lttng_action_stop_session_create_from_buffer(
                goto end;
        }
 
-       comm = (const struct lttng_action_stop_session_comm *) view->data;
+       comm = (typeof(comm)) view->buffer.data;
        session_name = (const char *) &comm->data;
 
        if (!lttng_buffer_view_contains_string(
-                       view, session_name, comm->session_name_len)) {
+                       &view->buffer, session_name, comm->session_name_len)) {
                consumed_len = -1;
                goto end;
        }
@@ -183,8 +184,7 @@ ssize_t lttng_action_stop_session_create_from_buffer(
                goto end;
        }
 
-       consumed_len = sizeof(struct lttng_action_stop_session_comm) +
-                       comm->session_name_len;
+       consumed_len = sizeof(*comm) + comm->session_name_len;
        *p_action = action;
        action = NULL;