X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Furi.cpp;h=8e663c46a732116b84c9e5c20615c6c018354034;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=393eba81594aefd3087b1577b6660d4cdb0b2511;hpb=1c9a0b0e83c7e073c4e576c0bed95de335b0e502;p=lttng-tools.git

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 393eba815..8e663c46a 100644
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -7,16 +7,16 @@
 
 #define _LGPL_SOURCE
 #include <arpa/inet.h>
-#include <common/compat/netdb.h>
+#include <common/compat/netdb.hpp>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 
-#include <common/common.h>
-#include <common/defaults.h>
-#include <common/utils.h>
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/utils.hpp>
 
-#include "uri.h"
+#include "uri.hpp"
 
 #define LOOPBACK_ADDR_IPV4 "127.0.0.1"
 #define LOOPBACK_ADDR_IPV6 "::1"
@@ -306,7 +306,7 @@ ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
 	}
 
 	/* Allocate URI array */
-	tmp_uris = (lttng_uri *) zmalloc(sizeof(struct lttng_uri) * size);
+	tmp_uris = calloc<lttng_uri>(size);
 	if (tmp_uris == NULL) {
 		PERROR("zmalloc uri");
 		goto error;
@@ -634,7 +634,7 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
 		goto error;
 	}
 
-	tmp_uris = (lttng_uri *) zmalloc(sizeof(struct lttng_uri) * uri_count);
+	tmp_uris = calloc<lttng_uri>(uri_count);
 	if (tmp_uris == NULL) {
 		PERROR("zmalloc uris");
 		goto error;