Fix -Wshadow warnings

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

diff --git a/src/ctf-writer/event.h b/src/ctf-writer/event.h
index 69077a8498a1bb908e3f5fce5431fde5dbcc0a52..a51b9011f5e6614bc091da2586a3b2acfe0854b2 100644 (file)
--- a/src/ctf-writer/event.h
+++ b/src/ctf-writer/event.h
@@ -30,10 +30,10 @@
 
 #include "common/assert.h"
 #include "common/macros.h"
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/fields.h>
-#include <babeltrace2/ctf-writer/stream-class.h>
-#include <babeltrace2/ctf-writer/stream.h>
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/fields.h>
+#include <babeltrace2-ctf-writer/stream-class.h>
+#include <babeltrace2-ctf-writer/stream.h>
 #include "ctfser/ctfser.h"
 
 #include "assert-pre.h"
@@ -82,14 +82,14 @@ static inline
 struct bt_ctf_event_class_common *bt_ctf_event_common_borrow_class(
                struct bt_ctf_event_common *event)
 {
-       BT_ASSERT(event);
+       BT_ASSERT_DBG(event);
        return event->class;
 }
 
-typedef void *(*create_field_func)(void *);
-typedef void (*release_field_func)(void *);
-typedef void *(*create_header_field_func)(void *, void *);
-typedef void (*release_header_field_func)(void *, void *);
+typedef void *(*create_field_func_type)(void *);
+typedef void (*release_field_func_type)(void *);
+typedef void *(*create_header_field_func_type)(void *, void *);
+typedef void (*release_header_field_func_type)(void *, void *);
 
 BT_HIDDEN
 int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event,
@@ -101,10 +101,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);
 
 static inline
 struct bt_ctf_field_common *bt_ctf_event_common_borrow_payload(
@@ -115,7 +115,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_payload(
        BT_CTF_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (!event->payload_field) {
-               BT_LOGV("Event has no current payload field: addr=%p, "
+               BT_LOGT("Event has no current payload field: addr=%p, "
                        "event-class-name=\"%s\", event-class-id=%" PRId64,
                        event, bt_ctf_event_class_common_get_name(event->class),
                        bt_ctf_event_class_common_get_id(event->class));
@@ -137,7 +137,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_header(
        BT_CTF_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (!event->header_field) {
-               BT_LOGV("Event has no current header field: addr=%p, "
+               BT_LOGT("Event has no current header field: addr=%p, "
                        "event-class-name=\"%s\", event-class-id=%" PRId64,
                        event, bt_ctf_event_class_common_get_name(event->class),
                        bt_ctf_event_class_common_get_id(event->class));
@@ -159,7 +159,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_context(
        BT_CTF_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (!event->context_field) {
-               BT_LOGV("Event has no current context field: addr=%p, "
+               BT_LOGT("Event has no current context field: addr=%p, "
                        "event-class-name=\"%s\", event-class-id=%" PRId64,
                        event, bt_ctf_event_class_common_get_name(event->class),
                        bt_ctf_event_class_common_get_id(event->class));
@@ -181,7 +181,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_stream_event_context(
        BT_CTF_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (!event->stream_event_context_field) {
-               BT_LOGV("Event has no current stream event context field: addr=%p, "
+               BT_LOGT("Event has no current stream event context field: addr=%p, "
                        "event-class-name=\"%s\", event-class-id=%" PRId64,
                        event, bt_ctf_event_class_common_get_name(event->class),
                        bt_ctf_event_class_common_get_id(event->class));