X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.cpp;h=1d81143ae562bd6589ad09b8c1e07b0dc59b6575;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=451a1eade8ce182eea37d94372cbeadca2b2ac5b;hpb=21cf9b6b1843774306a76f4dccddddd706b64f79;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.cpp b/src/bin/lttng/commands/enable_events.cpp
index 451a1eade..1d81143ae 100644
--- a/src/bin/lttng/commands/enable_events.cpp
+++ b/src/bin/lttng/commands/enable_events.cpp
@@ -15,21 +15,21 @@
 #include <inttypes.h>
 #include <ctype.h>
 
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/compat/string.h>
-#include <common/compat/getenv.h>
-#include <common/string-utils/string-utils.h>
-#include <common/utils.h>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/compat/string.hpp>
+#include <common/compat/getenv.hpp>
+#include <common/string-utils/string-utils.hpp>
+#include <common/utils.hpp>
 
 /* Mi dependancy */
-#include <common/mi-lttng.h>
+#include <common/mi-lttng.hpp>
 
-#include <lttng/domain-internal.h>
-#include <lttng/event-internal.h>
+#include <lttng/domain-internal.hpp>
+#include <lttng/event-internal.hpp>
 
-#include "../command.h"
-#include "../loglevel.h"
-#include "../uprobe.h"
+#include "../command.hpp"
+#include "../loglevel.hpp"
+#include "../uprobe.hpp"
 
 #if (LTTNG_SYMBOL_NAME_LEN == 256)
 #define LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API	"255"
@@ -129,7 +129,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt)
 			ret = CMD_ERROR;
 			goto end;
 		}
-		ev->attr.probe.offset = strtoul(s_hex, NULL, 0);
+		ev->attr.probe.offset = strtoull(s_hex, NULL, 0);
 		DBG("probe offset %" PRIu64, ev->attr.probe.offset);
 		ev->attr.probe.addr = 0;
 		goto end;
@@ -163,7 +163,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt)
 			ret = CMD_ERROR;
 			goto end;
 		}
-		ev->attr.probe.addr = strtoul(s_hex, NULL, 0);
+		ev->attr.probe.addr = strtoull(s_hex, NULL, 0);
 		DBG("probe addr %" PRIu64, ev->attr.probe.addr);
 		ev->attr.probe.offset = 0;
 		memset(ev->attr.probe.symbol_name, 0, LTTNG_SYMBOL_NAME_LEN);
@@ -254,7 +254,7 @@ char *print_exclusions(const struct lttng_dynamic_pointer_array *exclusions)
 	}
 
 	length += sizeof(preamble);
-	ret = (char *) zmalloc(length);
+	ret = calloc<char>(length);
 	if (!ret) {
 		return NULL;
 	}