X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcontext.cpp;h=a4111ad9002e9a29fcd073b4b4c6f93b41041040;hb=a9cfc0f36bf8ade64df08392b03a9f15409dc01b;hp=ab61a8133386b026bf27972a168030c74d9c401f;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c;p=lttng-tools.git

diff --git a/src/common/context.cpp b/src/common/context.cpp
index ab61a8133..a4111ad90 100644
--- a/src/common/context.cpp
+++ b/src/common/context.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "context.h"
+#include "context.hpp"
 #include <stddef.h>
 #include <string.h>
-#include <common/error.h>
-#include <common/macros.h>
+#include <common/error.hpp>
+#include <common/macros.hpp>
 
 int parse_application_context(const char *str, char **out_provider_name,
 		char **out_ctx_name)
@@ -52,7 +52,7 @@ int parse_application_context(const char *str, char **out_provider_name,
 	}
 
 	provider_name_len = colon_pos - sizeof(app_ctx_prefix) + 2;
-	provider_name = (char *) zmalloc(provider_name_len);
+	provider_name = calloc<char>(provider_name_len);
 	if (!provider_name) {
 		PERROR("malloc provider_name");
 		goto not_found;
@@ -61,7 +61,7 @@ int parse_application_context(const char *str, char **out_provider_name,
 			provider_name_len - 1);
 
 	ctx_name_len = len - colon_pos;
-	ctx_name = (char *) zmalloc(ctx_name_len);
+	ctx_name = calloc<char>(ctx_name_len);
 	if (!ctx_name) {
 		PERROR("malloc ctx_name");
 		goto not_found;