sessiond-comm: prefix lttcomm_sessiond_command entries

[lttng-tools.git] / src / bin / lttng-sessiond / clear.cpp

diff --git a/src/bin/lttng-sessiond/clear.cpp b/src/bin/lttng-sessiond/clear.cpp
index fcac76ffa4c349a7e97ce521b2d9cc8c06539413..524d545b3bcbfa67d12bcec20b6648943a3ba0b7 100644 (file)
--- a/src/bin/lttng-sessiond/clear.cpp
+++ b/src/bin/lttng-sessiond/clear.cpp
@@ -20,9 +20,11 @@
 #include "kernel.hpp"
 #include "cmd.hpp"
 
+namespace {
 struct cmd_clear_session_reply_context {
        int reply_sock_fd;
 };
+} /* namespace */
 
 static
 void cmd_clear_session_reply(const struct ltt_session *session,
@@ -33,7 +35,7 @@ void cmd_clear_session_reply(const struct ltt_session *session,
        const struct cmd_clear_session_reply_context *reply_context =
                        (cmd_clear_session_reply_context *) _reply_context;
        struct lttcomm_lttng_msg llm = {
-               .cmd_type = LTTNG_CLEAR_SESSION,
+               .cmd_type = LTTCOMM_SESSIOND_COMMAND_CLEAR_SESSION,
                .ret_code = LTTNG_OK,
                .pid = UINT32_MAX,
                .cmd_header_size = 0,
@@ -67,7 +69,7 @@ int cmd_clear_session(struct ltt_session *session, int *sock_fd)
        usess = session->ust_session;
 
        if (sock_fd) {
-               reply_context = (cmd_clear_session_reply_context *) zmalloc(sizeof(*reply_context));
+               reply_context = zmalloc<cmd_clear_session_reply_context>();
                if (!reply_context) {
                        ret = LTTNG_ERR_NOMEM;
                        goto end;