- struct bt_ctf_packet *packet = NULL;
- struct bt_ctf_stream_class *stream_class = NULL;
- struct bt_ctf_trace *trace = NULL;
-
- BT_LOGD("Creating packet object: stream-addr=%p", stream);
-
- if (!stream) {
- BT_LOGW_STR("Invalid parameter: stream is NULL.");
- goto end;
- }
-
- if (stream->pos.fd >= 0) {
- BT_LOGW_STR("Invalid parameter: stream is a CTF writer stream.");
- goto end;
- }
-
- stream_class = bt_ctf_stream_get_class(stream);
- assert(stream_class);
- trace = bt_ctf_stream_class_get_trace(stream_class);
- assert(trace);
- packet = g_new0(struct bt_ctf_packet, 1);
+ struct bt_packet *packet = NULL;
+ struct bt_stream_class *stream_class = NULL;
+ struct bt_trace *trace = NULL;
+
+ BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+ BT_LOGD("Creating packet object: stream-addr=%p, "
+ "stream-name=\"%s\", stream-class-addr=%p, "
+ "stream-class-name=\"%s\", stream-class-id=%" PRId64,
+ stream, bt_stream_get_name(stream),
+ stream->common.stream_class,
+ bt_stream_class_common_get_name(stream->common.stream_class),
+ bt_stream_class_common_get_id(stream->common.stream_class));
+ stream_class = bt_stream_get_class(stream);
+ BT_ASSERT(stream_class);
+ trace = bt_stream_class_get_trace(stream_class);
+ BT_ASSERT(trace);
+ packet = g_new0(struct bt_packet, 1);