X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fevent.c;h=0f7a8a0a561ffc05d2016bf50fa81e9015656ab5;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=576257900dc62e3dd9db693c2b4508148d87817a;hpb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;p=babeltrace.git

diff --git a/src/lib/graph/message/event.c b/src/lib/graph/message/event.c
index 57625790..0f7a8a0a 100644
--- a/src/lib/graph/message/event.c
+++ b/src/lib/graph/message/event.c
@@ -36,8 +36,7 @@
 #include <babeltrace2/trace-ir/trace.h>
 #include "lib/trace-ir/clock-snapshot.h"
 #include "lib/graph/graph.h"
-#include <babeltrace2/graph/message-event-const.h>
-#include <babeltrace2/graph/message-event.h>
+#include <babeltrace2/graph/message.h>
 #include <babeltrace2/types.h>
 #include <stdbool.h>
 #include <inttypes.h>
@@ -85,7 +84,7 @@ struct bt_message *create_event_message(
 		const struct bt_stream *c_stream, bool with_cs,
 		uint64_t raw_value)
 {
-	struct bt_self_component_port_input_message_iterator *msg_iter =
+	struct bt_message_iterator *msg_iter =
 		(void *) self_msg_iter;
 	struct bt_message_event *message = NULL;
 	struct bt_event_class *event_class = (void *) c_event_class;
@@ -177,6 +176,7 @@ struct bt_message *bt_message_event_create(
 		const struct bt_event_class *event_class,
 		const struct bt_stream *stream)
 {
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
 	return create_event_message(msg_iter, event_class, NULL, stream, false, 0);
 }
@@ -186,6 +186,7 @@ struct bt_message *bt_message_event_create_with_packet(
 		const struct bt_event_class *event_class,
 		const struct bt_packet *packet)
 {
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	return create_event_message(msg_iter, event_class, packet,
 		packet->stream, false, 0);
@@ -197,6 +198,7 @@ struct bt_message *bt_message_event_create_with_default_clock_snapshot(
 		const struct bt_stream *stream,
 		uint64_t raw_value)
 {
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
 	return create_event_message(msg_iter, event_class, NULL, stream,
 		true, raw_value);
@@ -209,6 +211,7 @@ bt_message_event_create_with_packet_and_default_clock_snapshot(
 		const struct bt_packet *packet,
 		uint64_t raw_value)
 {
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	return create_event_message(msg_iter, event_class, packet,
 		packet->stream, true, raw_value);