X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Fclear.cpp;h=b205ac8f2b8af75e8584d5ba3b378f9c9f2562c9;hb=37a5ef391d8d282fb8c8978e4761413b69d56072;hp=0eaf97364ce9c14f8c02fdd4b48e945b7d1ab81b;hpb=4bd69c5f1161cd065f487da0f4c1aa03a73c47e4;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/clear.cpp b/src/lib/lttng-ctl/clear.cpp
index 0eaf97364..b205ac8f2 100644
--- a/src/lib/lttng-ctl/clear.cpp
+++ b/src/lib/lttng-ctl/clear.cpp
@@ -13,14 +13,14 @@
 #include <lttng/lttng-error.h>
 #include <lttng/clear.h>
 #include <lttng/clear-handle.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/macros.h>
-#include <common/compat/poll.h>
-#include <common/dynamic-buffer.h>
-#include <common/buffer-view.h>
-#include <common/optional.h>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/macros.hpp>
+#include <common/compat/poll.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/buffer-view.hpp>
+#include <common/optional.hpp>
 
-#include "lttng-ctl-helper.h"
+#include "lttng-ctl-helper.hpp"
 
 enum communication_state {
 	COMMUNICATION_STATE_RECEIVE_LTTNG_MSG,
@@ -64,7 +64,7 @@ static
 struct lttng_clear_handle *lttng_clear_handle_create(int sessiond_socket)
 {
 	int ret;
-	struct lttng_clear_handle *handle = (lttng_clear_handle *) zmalloc(sizeof(*handle));
+	struct lttng_clear_handle *handle = zmalloc<lttng_clear_handle>();
 
 	if (!handle) {
 		goto end;
@@ -282,7 +282,11 @@ enum lttng_error_code lttng_clear_session(const char *session_name,
 	enum lttng_error_code ret_code = LTTNG_OK;
 	struct lttng_clear_handle *handle = NULL;
 	struct lttcomm_session_msg lsm = {
-		.cmd_type = LTTNG_CLEAR_SESSION,
+		.cmd_type = LTTCOMM_SESSIOND_COMMAND_CLEAR_SESSION,
+		.session = {},
+		.domain = {},
+		.u = {},
+		.fd_count = 0,
 	};
 	int sessiond_socket = -1;
 	ssize_t comm_ret;