X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fevent.h;h=ae6692d137491d50486ba93ea22159cf0d90c317;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=1a8138ab2ab2fd432b686b696a31e85c3150f5e4;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/ctf-writer/event.h b/src/ctf-writer/event.h
index 1a8138ab..ae6692d1 100644
--- a/src/ctf-writer/event.h
+++ b/src/ctf-writer/event.h
@@ -29,11 +29,11 @@
  */
 
 #include "common/assert.h"
-#include "common/babeltrace.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 "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 "ctfser/ctfser.h"
 
 #include "assert-pre.h"
@@ -82,7 +82,7 @@ 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;
 }
 
@@ -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));