Fix -Wshadow warnings

[babeltrace.git] / src / ctf-writer / event.c

diff --git a/src/ctf-writer/event.c b/src/ctf-writer/event.c
index c68b87adb7b15af4020fd37e6d110bcb0a3fe097..5c483ed4164630de0871f56e43d480c023e38411 100644 (file)
--- a/src/ctf-writer/event.c
+++ b/src/ctf-writer/event.c
@@ -26,13 +26,13 @@
 
 #include <inttypes.h>
 
-#include <babeltrace2/ctf-writer/event.h>
-#include <babeltrace2/ctf-writer/fields.h>
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/object.h>
-#include <babeltrace2/ctf-writer/stream-class.h>
-#include <babeltrace2/ctf-writer/trace.h>
-#include <babeltrace2/ctf-writer/utils.h>
+#include <babeltrace2-ctf-writer/event.h>
+#include <babeltrace2-ctf-writer/fields.h>
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/stream-class.h>
+#include <babeltrace2-ctf-writer/trace.h>
+#include <babeltrace2-ctf-writer/utils.h>
 
 #include "common/assert.h"
 #include "compat/compiler.h"
@@ -72,14 +72,14 @@ int bt_ctf_event_common_validate_types_for_create(
        struct bt_ctf_private_value *environment = NULL;
 
        stream_class = bt_ctf_event_class_common_borrow_stream_class(event_class);
-       BT_ASSERT(stream_class);
+       BT_ASSERT_DBG(stream_class);
        trace = bt_ctf_stream_class_common_borrow_trace(stream_class);
        if (trace) {
                BT_LOGD_STR("Event class is part of a trace.");
                packet_header_type =
                        bt_ctf_trace_common_borrow_packet_header_field_type(trace);
                trace_valid = trace->valid;
-               BT_ASSERT(trace_valid);
+               BT_ASSERT_DBG(trace_valid);
                environment = trace->environment;
        }
 
@@ -132,10 +132,10 @@ static
 int bt_ctf_event_common_create_fields(
                struct bt_ctf_stream_class_common *stream_class,
                struct bt_ctf_validation_output *validation_output,
-               create_field_func create_field_func,
-               release_field_func release_field_func,
-               create_header_field_func create_header_field_func,
-               release_header_field_func release_header_field_func,
+               create_field_func_type create_field_func,
+               release_field_func_type release_field_func,
+               create_header_field_func_type create_header_field_func,
+               release_header_field_func_type release_header_field_func,
                struct bt_ctf_field_wrapper **header_field,
                struct bt_ctf_field_common **stream_event_context_field,
                struct bt_ctf_field_common **context_field,
@@ -219,7 +219,7 @@ int _bt_ctf_event_common_validate(struct bt_ctf_event_common *event)
        int ret = 0;
        struct bt_ctf_stream_class_common *stream_class;
 
-       BT_ASSERT(event);
+       BT_ASSERT_DBG(event);
        if (event->header_field) {
                ret = bt_ctf_field_common_validate_recursive(
                        event->header_field->field);
@@ -237,7 +237,7 @@ int _bt_ctf_event_common_validate(struct bt_ctf_event_common *event)
         * We should not have been able to create the event without associating
         * the event class to a stream class.
         */
-       BT_ASSERT(stream_class);
+       BT_ASSERT_DBG(stream_class);
 
        if (stream_class->event_context_field_type) {
                ret = bt_ctf_field_common_validate_recursive(
@@ -276,7 +276,7 @@ BT_HIDDEN
 void _bt_ctf_event_common_set_is_frozen(struct bt_ctf_event_common *event,
                bool is_frozen)
 {
-       BT_ASSERT(event);
+       BT_ASSERT_DBG(event);
        BT_LOGD("Freezing event: addr=%p, "
                "event-class-name=\"%s\", event-class-id=%" PRId64,
                event, bt_ctf_event_class_common_get_name(event->class),
@@ -319,10 +319,10 @@ int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event,
                int (*map_clock_classes_func)(struct bt_ctf_stream_class_common *stream_class,
                        struct bt_ctf_field_type_common *packet_context_field_type,
                        struct bt_ctf_field_type_common *event_header_field_type),
-               create_field_func create_field_func,
-               release_field_func release_field_func,
-               create_header_field_func create_header_field_func,
-               release_header_field_func release_header_field_func)
+               create_field_func_type create_field_func,
+               release_field_func_type release_field_func,
+               create_header_field_func_type create_header_field_func,
+               release_header_field_func_type release_header_field_func)
 {
        int ret;
        struct bt_ctf_trace_common *trace = NULL;
@@ -348,7 +348,7 @@ int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event,
                event_class);
 
        /* The event class was frozen when added to its stream class */
-       BT_ASSERT(event_class->frozen);
+       BT_ASSERT_DBG(event_class->frozen);
        trace = bt_ctf_stream_class_common_borrow_trace(stream_class);
 
        if (must_be_in_trace) {
@@ -535,9 +535,10 @@ int map_clock_classes_func(struct bt_ctf_stream_class_common *stream_class,
 }
 
 static
-void destroy_event_header_field(struct bt_ctf_field_wrapper *field_wrapper)
+void destroy_event_header_field(struct bt_ctf_field_wrapper *field_wrapper,
+               struct bt_ctf_stream_class *stream_class)
 {
-       BT_ASSERT(field_wrapper);
+       BT_ASSERT_DBG(field_wrapper);
        bt_ctf_object_put_ref(field_wrapper->field);
        bt_ctf_field_wrapper_destroy(field_wrapper);
 }
@@ -567,7 +568,7 @@ error:
        bt_ctf_object_put_ref(field);
 
        if (field_wrapper) {
-               destroy_event_header_field(field_wrapper);
+               destroy_event_header_field(field_wrapper, stream_class);
                field_wrapper = NULL;
        }
 
@@ -579,7 +580,7 @@ static
 void release_event_header_field(struct bt_ctf_field_wrapper *field_wrapper,
                struct bt_ctf_event_common *event_common)
 {
-       BT_ASSERT(field_wrapper);
+       BT_ASSERT_DBG(field_wrapper);
        BT_CTF_OBJECT_PUT_REF_AND_RESET(field_wrapper->field);
        bt_ctf_field_wrapper_destroy(field_wrapper);
 }
@@ -620,10 +621,10 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
                (bt_ctf_validation_flag_copy_field_type_func)
                        bt_ctf_field_type_copy,
                false, map_clock_classes_func,
-               (create_field_func) bt_ctf_field_create,
-               (release_field_func) bt_ctf_object_put_ref,
-               (create_header_field_func) create_event_header_field,
-               (release_header_field_func) destroy_event_header_field);
+               (create_field_func_type) bt_ctf_field_create,
+               (release_field_func_type) bt_ctf_object_put_ref,
+               (create_header_field_func_type) create_event_header_field,
+               (release_header_field_func_type) destroy_event_header_field);
        if (ret) {
                /* bt_ctf_event_common_initialize() logs errors */
                goto error;
@@ -647,7 +648,7 @@ struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
 BT_HIDDEN
 struct bt_ctf_stream *bt_ctf_event_borrow_stream(struct bt_ctf_event *event)
 {
-       BT_ASSERT(event);
+       BT_ASSERT_DBG(event);
        return (struct bt_ctf_stream *)
                bt_ctf_object_borrow_parent(&BT_CTF_TO_COMMON(event)->base);
 }
@@ -716,10 +717,10 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event,
 {
        int ret = 0;
 
-       BT_ASSERT(event);
-       BT_ASSERT(ctfser);
+       BT_ASSERT_DBG(event);
+       BT_ASSERT_DBG(ctfser);
 
-       BT_LOGV_STR("Serializing event's context field.");
+       BT_LOGT_STR("Serializing event's context field.");
        if (event->common.context_field) {
                ret = bt_ctf_field_serialize_recursive(
                        (void *) event->common.context_field, ctfser,
@@ -735,7 +736,7 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event,
                }
        }
 
-       BT_LOGV_STR("Serializing event's payload field.");
+       BT_LOGT_STR("Serializing event's payload field.");
        if (event->common.payload_field) {
                ret = bt_ctf_field_serialize_recursive(
                        (void *) event->common.payload_field, ctfser,
@@ -791,7 +792,7 @@ int bt_ctf_event_set_header(struct bt_ctf_event *event,
 
        bt_ctf_object_put_ref(event->common.header_field->field);
        event->common.header_field->field = bt_ctf_object_get_ref(header);
-       BT_LOGV("Set event's header field: event-addr=%p, "
+       BT_LOGT("Set event's header field: event-addr=%p, "
                "event-class-name=\"%s\", event-class-id=%" PRId64 ", "
                "header-field-addr=%p",
                event, bt_ctf_event_class_common_get_name(event->common.class),
@@ -825,7 +826,7 @@ int bt_ctf_event_common_set_payload(struct bt_ctf_event *event,
 
        bt_ctf_object_put_ref(event->common.payload_field);
        event->common.payload_field = bt_ctf_object_get_ref(payload);
-       BT_LOGV("Set event's payload field: event-addr=%p, "
+       BT_LOGT("Set event's payload field: event-addr=%p, "
                "event-class-name=\"%s\", event-class-id=%" PRId64 ", "
                "payload-field-addr=%p",
                event, bt_ctf_event_class_common_get_name(event->common.class),
@@ -858,7 +859,7 @@ int bt_ctf_event_set_context(struct bt_ctf_event *event,
 
        bt_ctf_object_put_ref(event->common.context_field);
        event->common.context_field = bt_ctf_object_get_ref(context);
-       BT_LOGV("Set event's context field: event-addr=%p, "
+       BT_LOGT("Set event's context field: event-addr=%p, "
                "event-class-name=\"%s\", event-class-id=%" PRId64 ", "
                "context-field-addr=%p",
                event, bt_ctf_event_class_common_get_name(event->common.class),
@@ -893,7 +894,7 @@ int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event,
 
        bt_ctf_object_put_ref(event->common.stream_event_context_field);
        event->common.stream_event_context_field = bt_ctf_object_get_ref(stream_event_context);
-       BT_LOGV("Set event's stream event context field: event-addr=%p, "
+       BT_LOGT("Set event's stream event context field: event-addr=%p, "
                "event-class-name=\"%s\", event-class-id=%" PRId64 ", "
                "stream-event-context-field-addr=%p",
                event, bt_ctf_event_class_common_get_name(event->common.class),