X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fstream-class.c;h=e6c2c8f6177cad16e0a1872d4b5cfa3b8d540f0c;hp=c87978b5a19e5c92ad1287ad99161fb2571f1f72;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=6871026b82224d83bb63cbb44cc33c16c766d96d

diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c
index c87978b5..e6c2c8f6 100644
--- a/src/lib/trace-ir/stream-class.c
+++ b/src/lib/trace-ir/stream-class.c
@@ -1,31 +1,15 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@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:
- *
- * 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.
  */
 
 #define BT_LOG_TAG "LIB/STREAM-CLASS"
 #include "lib/logging.h"
 
 #include "lib/assert-pre.h"
-#include <babeltrace2/trace-ir/trace-const.h>
+#include <babeltrace2/trace-ir/trace.h>
 #include "compat/compiler.h"
 #include "common/align.h"
 #include "compat/endian.h"
@@ -177,6 +161,7 @@ end:
 
 struct bt_stream_class *bt_stream_class_create(struct bt_trace_class *tc)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
 	BT_ASSERT_PRE(tc->assigns_automatic_stream_class_id,
 		"Trace class does not automatically assigns stream class IDs: "
@@ -188,6 +173,7 @@ struct bt_stream_class *bt_stream_class_create(struct bt_trace_class *tc)
 struct bt_stream_class *bt_stream_class_create_with_id(
 		struct bt_trace_class *tc, uint64_t id)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
 	BT_ASSERT_PRE(!tc->assigns_automatic_stream_class_id,
 		"Trace class automatically assigns stream class IDs: "
@@ -218,6 +204,7 @@ enum bt_stream_class_set_name_status bt_stream_class_set_name(
 		struct bt_stream_class *stream_class,
 		const char *name)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
 	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
@@ -315,6 +302,7 @@ bt_stream_class_set_packet_context_field_class(
 		.event_payload = NULL,
 	};
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE(stream_class->supports_packets,
 		"Stream class does not support packets: %![sc-]+S",
@@ -377,6 +365,7 @@ bt_stream_class_set_event_common_context_field_class(
 		.event_payload = NULL,
 	};
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
 	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
@@ -425,6 +414,7 @@ bt_stream_class_set_default_clock_class(
 		struct bt_stream_class *stream_class,
 		struct bt_clock_class *clock_class)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
 	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);