X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.cpp;h=ed14a9e63ec7af3f721a80d4ee7b1d53d7429eaa;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=9be0cbcac8d07be1ee25f2a5dd7882243fdedc1e;hpb=1c9a0b0e83c7e073c4e576c0bed95de335b0e502;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.cpp b/src/common/sessiond-comm/sessiond-comm.cpp
index 9be0cbcac..ed14a9e63 100644
--- a/src/common/sessiond-comm/sessiond-comm.cpp
+++ b/src/common/sessiond-comm/sessiond-comm.cpp
@@ -17,17 +17,17 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include <common/common.h>
-#include <common/compat/errno.h>
+#include <common/common.hpp>
+#include <common/compat/errno.hpp>
 
-#include "sessiond-comm.h"
+#include "sessiond-comm.hpp"
 
 /* For Unix socket */
-#include <common/unix.h>
+#include <common/unix.hpp>
 /* For Inet socket */
-#include "inet.h"
+#include "inet.hpp"
 /* For Inet6 socket */
-#include "inet6.h"
+#include "inet6.hpp"
 
 #define NETWORK_TIMEOUT_ENV	"LTTNG_NETWORK_SOCKET_TIMEOUT"
 
@@ -178,9 +178,8 @@ error:
  */
 struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto)
 {
-	struct lttcomm_sock *sock;
+	struct lttcomm_sock *sock = zmalloc<lttcomm_sock>();
 
-	sock = (lttcomm_sock *) zmalloc(sizeof(lttcomm_sock));
 	if (sock == NULL) {
 		PERROR("zmalloc create sock");
 		goto end;
@@ -366,11 +365,10 @@ struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(struct lttng_uri *uri,
 {
 	int ret;
 	struct lttcomm_sock *tmp_sock = NULL;
-	struct lttcomm_relayd_sock *rsock = NULL;
+	struct lttcomm_relayd_sock *rsock = zmalloc<lttcomm_relayd_sock>();
 
 	LTTNG_ASSERT(uri);
 
-	rsock = (lttcomm_relayd_sock *) zmalloc(sizeof(*rsock));
 	if (!rsock) {
 		PERROR("zmalloc relayd sock");
 		goto error;