Build fix: missing stdio.h include in signal-helper.hpp

[lttng-tools.git] / src / bin / lttng / commands / add_context.cpp

diff --git a/src/bin/lttng/commands/add_context.cpp b/src/bin/lttng/commands/add_context.cpp
index 4e4bb9fac110d5823247f56983455fad38bcf523..5db0c5664888193d1b943558faf2ae4d3556a4aa 100644 (file)
--- a/src/bin/lttng/commands/add_context.cpp
+++ b/src/bin/lttng/commands/add_context.cpp
@@ -18,10 +18,10 @@
 
 #include <urcu/list.h>
 
-#include <lttng/domain-internal.h>
-#include <common/mi-lttng.h>
+#include <lttng/domain-internal.hpp>
+#include <common/mi-lttng.hpp>
 
-#include "../command.h"
+#include "../command.hpp"
 
 static char *opt_channel_name;
 static char *opt_session_name;
@@ -217,7 +217,7 @@ static struct poptOption long_options[] = {
        _PERF_HW_CACHE(optstr "-prefetch-misses", name, type,           \
                PREFETCH, MISS, hide)
 
-static
+namespace {
 const struct ctx_opts {
        /* Needed for end-of-list item. */
        ctx_opts()
@@ -552,8 +552,7 @@ struct ctx_type_list {
 } ctx_type_list = {
        .head = CDS_LIST_HEAD_INIT(ctx_type_list.head),
 };
-
-
+} /* namespace */
 
 /*
  * Find context numerical value from string.
@@ -902,21 +901,21 @@ void destroy_ctx_type(struct ctx_type *type)
        if (type->opt) {
                free(type->opt->symbol);
        }
-       free(type->opt);
+       delete type->opt;
        free(type);
 }
 
 static
 struct ctx_type *create_ctx_type(void)
 {
-       struct ctx_type *type = (ctx_type *) zmalloc(sizeof(*type));
+       struct ctx_type *type = zmalloc<ctx_type>();
 
        if (!type) {
                PERROR("malloc ctx_type");
                goto end;
        }
 
-       type->opt = (struct ctx_opts *) zmalloc(sizeof(*type->opt));
+       type->opt = new struct ctx_opts;
        if (!type->opt) {
                PERROR("malloc ctx_type options");
                destroy_ctx_type(type);
@@ -1091,7 +1090,7 @@ struct ctx_type *get_context_type(const char *ctx)
        }
 
        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;
@@ -1101,7 +1100,7 @@ struct ctx_type *get_context_type(const char *ctx)
        type->opt->u.app_ctx.provider_name = provider_name;
 
        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;