X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclear.cpp;h=524d545b3bcbfa67d12bcec20b6648943a3ba0b7;hb=4f2da8b8c0f8fad2ae35dbdb9f29769da52a3dc1;hp=1239c5f2467a7db22537de7eb1f4fd751baefe0f;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/clear.cpp b/src/bin/lttng-sessiond/clear.cpp
index 1239c5f24..524d545b3 100644
--- a/src/bin/lttng-sessiond/clear.cpp
+++ b/src/bin/lttng-sessiond/clear.cpp
@@ -10,19 +10,21 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <common/defaults.h>
-#include <common/error.h>
-#include <common/utils.h>
+#include <common/defaults.hpp>
+#include <common/error.hpp>
+#include <common/utils.hpp>
 
-#include "clear.h"
-#include "session.h"
-#include "ust-app.h"
-#include "kernel.h"
-#include "cmd.h"
+#include "clear.hpp"
+#include "session.hpp"
+#include "ust-app.hpp"
+#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,11 +35,12 @@ 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,
 		.data_size = 0,
+		.fd_count = 0,
 	};
 
 	DBG("End of clear command: replying to client");
@@ -66,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;