X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fpacket.c;h=96cbae019e54d11dda7dd80c427d560b7538fa49;hb=1778c2a4134647150b199b2b57130817144446b0;hp=50304868bf5da33789a3efddbc1058894c1df40f;hpb=44e2e039eb4bea7100896f504f6e6a40b20b6a1e;p=babeltrace.git

diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c
index 50304868..96cbae01 100644
--- a/src/lib/trace-ir/packet.c
+++ b/src/lib/trace-ir/packet.c
@@ -1,30 +1,13 @@
 /*
- * Copyright 2016-2018 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2016-2018 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/PACKET"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
-#include <babeltrace2/trace-ir/packet-const.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>
@@ -44,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;
 }
 
@@ -56,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;
 }
 
@@ -220,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);