ctf: make msg-iter not use bt_packet_context_field

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

diff --git a/src/lib/trace-ir/packet-context-field.c b/src/lib/trace-ir/packet-context-field.c
index 1530ef97873028a585706139c82291fce08e3988..c5a628c2e1e5ac96a8c51f69fa3a77bdfb8e7556 100644 (file)
--- a/src/lib/trace-ir/packet-context-field.c
+++ b/src/lib/trace-ir/packet-context-field.c
@@ -62,9 +62,10 @@ struct bt_packet_context_field *bt_packet_context_field_create(
 {
        struct bt_field_wrapper *field_wrapper;
 
+       BT_ASSERT_PRE_NO_ERROR();
        BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       BT_ASSERT_PRE(stream_class->frozen,
-               "Stream class is not part of a trace class: %!+S",
+       BT_ASSERT_PRE(stream_class->supports_packets,
+               "Stream class does not support packets: %![sc-]+S",
                stream_class);
        BT_ASSERT_PRE(stream_class->packet_context_fc,
                "Stream class has no packet context field class: %!+S",
@@ -73,20 +74,14 @@ struct bt_packet_context_field *bt_packet_context_field_create(
                &stream_class->packet_context_field_pool,
                (void *) stream_class->packet_context_fc);
        if (!field_wrapper) {
-               BT_LIB_LOGE("Cannot allocate one packet context field from stream class: "
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot allocate one packet context field from stream class: "
                        "%![sc-]+S", stream_class);
-               goto error;
+               goto end;
        }
 
        BT_ASSERT(field_wrapper->field);
        bt_stream_class_freeze(stream_class);
-       goto end;
-
-error:
-       if (field_wrapper) {
-               bt_field_wrapper_destroy(field_wrapper);
-               field_wrapper = NULL;
-       }
 
 end:
        return (void *) field_wrapper;