Fix: bt2: autodisc: remove thread error while inserting status in map

[babeltrace.git] / src / lib / trace-ir / packet.c

diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c
index 1c9268e8fdd2e4cff773867da761764f823cf16c..96cbae019e54d11dda7dd80c427d560b7538fa49 100644 (file)
--- a/src/lib/trace-ir/packet.c
+++ b/src/lib/trace-ir/packet.c
@@ -7,7 +7,7 @@
 #define BT_LOG_TAG "LIB/PACKET"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/packet.h>
 #include <babeltrace2/trace-ir/trace.h>
 #include <babeltrace2/trace-ir/stream-class.h>
@@ -27,7 +27,7 @@
 
 struct bt_stream *bt_packet_borrow_stream(struct bt_packet *packet)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_DEV_PACKET_NON_NULL(packet);
        return packet->stream;
 }
 
@@ -39,7 +39,7 @@ const struct bt_stream *bt_packet_borrow_stream_const(
 
 struct bt_field *bt_packet_borrow_context_field(struct bt_packet *packet)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_DEV_PACKET_NON_NULL(packet);
        return packet->context_field ? packet->context_field->field : NULL;
 }
 
@@ -203,8 +203,9 @@ struct bt_packet *bt_packet_create(const struct bt_stream *c_stream)
        struct bt_stream *stream = (void *) c_stream;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
-       BT_ASSERT_PRE(stream->class->supports_packets,
+       BT_ASSERT_PRE_STREAM_NON_NULL(stream);
+       BT_ASSERT_PRE("stream-class-supports-packets",
+               stream->class->supports_packets,
                "Stream class does not support packets: %![sc-]+S",
                stream->class);
        packet = bt_object_pool_create_object(&stream->packet_pool);