#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"
{ .name = "tcp4", .leading_string = "tcp4://", .code = P_TCP, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 },
{ .name = "tcp6", .leading_string = "tcp6://", .code = P_TCP6, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV6 },
/* Invalid proto marking the end of the array. */
- { 0 }
+ {}
};
/*
}
/* 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;
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;