Prepare for '-Wmissing-field-initializers'

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 8e1b99ff902fb5dd91989840ade2ffc483afc170..ad3e23d4d8a15679977e7048ed6d6001ac0e3029 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -77,7 +77,7 @@ static int lttng_event_probe_attr_serialize(
 {
        int ret;
        size_t symbol_name_len;
-       struct lttng_event_probe_attr_comm comm = { 0 };
+       struct lttng_event_probe_attr_comm comm = {};
 
        symbol_name_len = lttng_strnlen(probe->symbol_name, LTTNG_SYMBOL_NAME_LEN);
        if (symbol_name_len == LTTNG_SYMBOL_NAME_LEN) {
@@ -700,7 +700,7 @@ int lttng_event_serialize(const struct lttng_event *event,
        unsigned int i;
        size_t header_offset, size_before_payload;
        size_t name_len;
-       struct lttng_event_comm event_comm = { 0 };
+       struct lttng_event_comm event_comm = {};
        struct lttng_event_comm *header;
 
        assert(event);
@@ -1128,7 +1128,7 @@ static int lttng_event_context_app_serialize(
                struct lttng_payload *payload)
 {
        int ret;
-       struct lttng_event_context_app_comm comm = { 0 };
+       struct lttng_event_context_app_comm comm = {};
        size_t provider_len, ctx_len;
        const char *provider_name;
        const char *ctx_name;
@@ -1196,7 +1196,7 @@ static int lttng_event_context_perf_counter_serialize(
                struct lttng_payload *payload)
 {
        int ret;
-       struct lttng_event_context_perf_counter_comm comm = { 0 };
+       struct lttng_event_context_perf_counter_comm comm = {};
 
        assert(payload);
        assert(context);
@@ -1417,7 +1417,7 @@ int lttng_event_field_serialize(const struct lttng_event_field *field,
        int ret;
        size_t header_offset, size_before_event;
        size_t name_len;
-       struct lttng_event_field_comm event_field_comm = { 0 };
+       struct lttng_event_field_comm event_field_comm = {};
        struct lttng_event_field_comm *header;
 
        assert(field);
@@ -1488,6 +1488,9 @@ static enum lttng_error_code compute_flattened_size(
        /* The basic struct lttng_event */
        storage_req = event_count * sizeof(struct lttng_event);
 
+       /* The struct·lttng_event_extended */
+       storage_req += event_count * sizeof(struct lttng_event_extended);
+
        for (i = 0; i < event_count; i++) {
                int probe_storage_req = 0;
                const struct event_list_element *element = (const struct event_list_element *)
@@ -1508,10 +1511,6 @@ static enum lttng_error_code compute_flattened_size(
                        probe_storage_req = ret;
                }
 
-               /* The struct·lttng_event_extended */
-               storage_req += event_count *
-                       sizeof(struct lttng_event_extended);
-
                if (element->filter_expression) {
                        storage_req += strlen(element->filter_expression) + 1;
                }