Add type-checked versions of allocation and deallocations functions

[lttng-tools.git] / src / common / relayd / relayd.cpp

diff --git a/src/common/relayd/relayd.cpp b/src/common/relayd/relayd.cpp
index 6c2641ac03bec575f2c7ad469bac9ddd19bb7fe0..5148bd03a9ed241e1141add72175fcf137e63f86 100644 (file)
--- a/src/common/relayd/relayd.cpp
+++ b/src/common/relayd/relayd.cpp
@@ -12,16 +12,16 @@
 #include <sys/stat.h>
 #include <inttypes.h>
 
-#include <common/common.h>
-#include <common/defaults.h>
-#include <common/compat/endian.h>
-#include <common/compat/string.h>
-#include <common/sessiond-comm/relayd.h>
-#include <common/index/ctf-index.h>
-#include <common/trace-chunk.h>
-#include <common/string-utils/format.h>
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/compat/endian.hpp>
+#include <common/compat/string.hpp>
+#include <common/sessiond-comm/relayd.hpp>
+#include <common/index/ctf-index.hpp>
+#include <common/trace-chunk.hpp>
+#include <common/string-utils/format.hpp>
 
-#include "relayd.h"
+#include "relayd.hpp"
 
 static
 bool relayd_supports_chunks(const struct lttcomm_relayd_sock *sock)
@@ -65,7 +65,7 @@ static int send_command(struct lttcomm_relayd_sock *rsock,
                buf_size += size;
        }
 
-       buf = (char *) zmalloc(buf_size);
+       buf = calloc<char>(buf_size);
        if (buf == NULL) {
                PERROR("zmalloc relayd send command buf");
                ret = -1;
@@ -166,7 +166,7 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
        base_path_len = strlen(base_path) + 1;
 
        msg_length = sizeof(*msg) + session_name_len + hostname_len + base_path_len;
-       msg = (lttcomm_relayd_create_session_2_11 *) zmalloc(msg_length);
+       msg = zmalloc<lttcomm_relayd_create_session_2_11>(msg_length);
        if (!msg) {
                PERROR("zmalloc create_session_2_11 command message");
                ret = -1;
@@ -446,7 +446,7 @@ static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock,
        pathname_len = strlen(pathname) + 1;
 
        msg_length = sizeof(*msg) + channel_name_len + pathname_len;
-       msg = (lttcomm_relayd_add_stream_2_11 *) zmalloc(msg_length);
+       msg = zmalloc<lttcomm_relayd_add_stream_2_11>(msg_length);
        if (!msg) {
                PERROR("zmalloc add_stream_2_11 command message");
                ret = -1;