Clean-up: sessiond: remove left-over code

[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 1239c5f2467a7db22537de7eb1f4fd751baefe0f..38268edd2e4362fb7dbdf1361c030a7de89e170a 100644 (file)
--- 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,
@@ -38,6 +40,7 @@ void cmd_clear_session_reply(const struct ltt_session *session,
                .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;