Build fix: missing initializer for member 'payload'

[lttng-tools.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 9cef3e9b9189829be10ca8eea0c300ac8be4fb4f..37c346621b1dd956995259f4687e100d09ea153c 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -5,28 +5,28 @@
  *
  */
 
-#include "common/compat/string.h"
-#include "common/macros.h"
-#include "lttng/lttng-error.h"
-#include <assert.h>
-#include <common/buffer-view.h>
-#include <common/dynamic-array.h>
-#include <common/dynamic-buffer.h>
-#include <common/error.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/align.h>
+#include <common/align.hpp>
+#include <common/buffer-view.hpp>
+#include <common/compat/string.hpp>
+#include <common/dynamic-array.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+
 #include <lttng/constant.h>
-#include <lttng/event-internal.h>
+#include <lttng/event-internal.hpp>
 #include <lttng/event.h>
-#include <lttng/userspace-probe-internal.h>
-#include <stdint.h>
-#include <string.h>
+#include <lttng/lttng-error.h>
+#include <lttng/userspace-probe-internal.hpp>
 
+namespace {
 struct event_list_element {
        struct lttng_event *event;
        struct lttng_event_exclusion *exclusions;
        char *filter_expression;
 };
+} /* namespace */
 
 static void event_list_destructor(void *ptr)
 {
@@ -43,7 +43,7 @@ struct lttng_event *lttng_event_copy(const struct lttng_event *event)
        struct lttng_event *new_event;
        struct lttng_event_extended *new_event_extended;
 
-       new_event = (lttng_event *) zmalloc(sizeof(*event));
+       new_event = zmalloc<lttng_event>();
        if (!new_event) {
                PERROR("Error allocating event structure");
                goto end;
@@ -56,7 +56,7 @@ struct lttng_event *lttng_event_copy(const struct lttng_event *event)
         * We need to create a new extended since the previous pointer is now
         * invalid.
         */
-       new_event_extended = (lttng_event_extended *) zmalloc(sizeof(*new_event_extended));
+       new_event_extended = zmalloc<lttng_event_extended>();
        if (!new_event_extended) {
                PERROR("Error allocating event extended structure");
                goto error;
@@ -113,7 +113,9 @@ static int lttng_event_function_attr_serialize(
 {
        int ret;
        size_t symbol_name_len;
-       struct lttng_event_function_attr_comm comm = { 0 };
+       struct lttng_event_function_attr_comm comm;
+
+       comm.symbol_name_len = 0;
 
        symbol_name_len = lttng_strnlen(
                        function->symbol_name, sizeof(function->symbol_name));
@@ -159,8 +161,7 @@ static ssize_t lttng_event_probe_attr_create_from_payload(
        comm = (typeof(comm)) comm_view.buffer.data;
        offset += sizeof(*comm);
 
-       local_attr = (struct lttng_event_probe_attr *) zmalloc(
-                       sizeof(*local_attr));
+       local_attr = zmalloc<lttng_event_probe_attr>();
        if (local_attr == NULL) {
                ret = -1;
                goto end;
@@ -224,8 +225,7 @@ static ssize_t lttng_event_function_attr_create_from_payload(
        comm = (typeof(comm)) view->buffer.data;
        offset += sizeof(*comm);
 
-       local_attr = (struct lttng_event_function_attr *) zmalloc(
-                       sizeof(*local_attr));
+       local_attr = zmalloc<lttng_event_function_attr>();
        if (local_attr == NULL) {
                ret = -1;
                goto end;
@@ -274,12 +274,12 @@ static ssize_t lttng_event_exclusions_create_from_payload(
                struct lttng_event_exclusion **exclusions)
 {
        ssize_t ret, offset = 0;
-       size_t size = (count * LTTNG_SYMBOL_NAME_LEN);
+       const size_t size = (count * LTTNG_SYMBOL_NAME_LEN);
        uint32_t i;
        const struct lttng_event_exclusion_comm *comm;
        struct lttng_event_exclusion *local_exclusions;
 
-       local_exclusions = (struct lttng_event_exclusion *) zmalloc(
+       local_exclusions = zmalloc<lttng_event_exclusion>(
                        sizeof(struct lttng_event_exclusion) + size);
        if (!local_exclusions) {
                ret = -1;
@@ -512,8 +512,7 @@ deserialize_filter_expression:
                        goto end;
                }
 
-               local_bytecode = (struct lttng_bytecode *) zmalloc(
-                               event_comm->bytecode_len);
+               local_bytecode = zmalloc<lttng_bytecode>(event_comm->bytecode_len);
                if (!local_bytecode) {
                        ret = -1;
                        goto end;
@@ -1080,8 +1079,7 @@ ssize_t lttng_event_context_create_from_payload(
        comm = (typeof(comm)) comm_view.data;
        offset += sizeof(*comm);
 
-       local_context = (struct lttng_event_context *)
-                       zmalloc(sizeof(*local_context));
+       local_context = zmalloc<lttng_event_context>();
        if (!local_context) {
                ret = -1;
                goto end;
@@ -1333,8 +1331,7 @@ ssize_t lttng_event_field_create_from_payload(
                offset += sizeof(*comm);
        }
 
-       local_event_field = (struct lttng_event_field *)
-                       zmalloc(sizeof(*local_event_field));
+       local_event_field = zmalloc<lttng_event_field>();
        if (!local_event_field) {
                ret = -1;
                goto end;
@@ -1715,8 +1712,7 @@ static enum lttng_error_code event_list_create_from_payload(
                ssize_t event_size;
                struct lttng_payload_view event_view =
                                lttng_payload_view_from_view(view, offset, -1);
-               struct event_list_element *element =
-                               (struct event_list_element *) zmalloc(sizeof(*element));
+               struct event_list_element *element = zmalloc<event_list_element>();
 
                if (!element) {
                        ret_code = LTTNG_ERR_NOMEM;
@@ -1872,7 +1868,7 @@ static enum lttng_error_code event_field_list_create_from_payload(
        assert(view);
        assert(event_field_list);
 
-       list = (struct lttng_dynamic_pointer_array *) zmalloc(sizeof(*list));
+       list = zmalloc<lttng_dynamic_pointer_array>();
        if (!list) {
                ret_code = LTTNG_ERR_NOMEM;
                goto end;