#include <lttng/lttng-error.h>
#include <lttng/load.h>
-#include <lttng/load-internal.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/config/session-config.h>
-#include <common/uri.h>
-#include <common/macros.h>
-#include <common/compat/string.h>
+#include <lttng/load-internal.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/config/session-config.hpp>
+#include <common/uri.hpp>
+#include <common/macros.hpp>
+#include <common/compat/string.hpp>
-#include "lttng-ctl-helper.h"
+#include "lttng-ctl-helper.hpp"
struct lttng_load_session_attr *lttng_load_session_attr_create(void)
{
- return (lttng_load_session_attr *) zmalloc(sizeof(struct lttng_load_session_attr));
+ return zmalloc<lttng_load_session_attr>();
}
static
}
if (!attr->override_attr) {
- attr->override_attr = (config_load_session_override_attr *) zmalloc(
- sizeof(struct config_load_session_override_attr));
+ attr->override_attr = zmalloc<config_load_session_override_attr>();
if (!attr->override_attr) {
ret = -LTTNG_ERR_NOMEM;
goto end;
uri[0].port = DEFAULT_NETWORK_CONTROL_PORT;
}
- url_str = (char *) zmalloc(PATH_MAX);
+ url_str = calloc<char>(PATH_MAX);
if (!url_str) {
/* FIXME: return valid error */
ret = -LTTNG_ERR_NOMEM;
}
if (!attr->override_attr) {
- attr->override_attr = (config_load_session_override_attr *) zmalloc(
- sizeof(struct config_load_session_override_attr));
+ attr->override_attr = zmalloc<config_load_session_override_attr>();
if (!attr->override_attr) {
ret = -LTTNG_ERR_NOMEM;
goto end;
uri[0].port = DEFAULT_NETWORK_DATA_PORT;
}
- url_str = (char *) zmalloc(PATH_MAX);
+ url_str = calloc<char>(PATH_MAX);
if (!url_str) {
ret = -LTTNG_ERR_NOMEM;
goto end;
}
if (!attr->override_attr) {
- attr->override_attr = (config_load_session_override_attr *) zmalloc(
- sizeof(struct config_load_session_override_attr));
+ attr->override_attr = zmalloc<config_load_session_override_attr>();
if (!attr->override_attr) {
ret = -LTTNG_ERR_NOMEM;
goto end;
}
if (!attr->override_attr) {
- attr->override_attr = (config_load_session_override_attr *) zmalloc(
- sizeof(struct config_load_session_override_attr));
+ attr->override_attr = zmalloc<config_load_session_override_attr>();
if (!attr->override_attr) {
ret = -LTTNG_ERR_NOMEM;
goto end;