X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fstream.c;h=07bdcc892f0f8d9c66404e9a1b69a65f24ef48ef;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=ec97a292cf46036e0fef3e74019806996bf3a62c;hpb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;p=babeltrace.git

diff --git a/src/lib/trace-ir/stream.c b/src/lib/trace-ir/stream.c
index ec97a292..07bdcc89 100644
--- a/src/lib/trace-ir/stream.c
+++ b/src/lib/trace-ir/stream.c
@@ -1,31 +1,14 @@
 /*
+ * 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"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
-#include <babeltrace2/trace-ir/stream-const.h>
+#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/stream.h>
 #include <babeltrace2/trace-ir/stream-class.h>
 #include <babeltrace2/trace-ir/trace.h>
@@ -167,6 +150,7 @@ struct bt_stream *bt_stream_create(struct bt_stream_class *stream_class,
 {
 	uint64_t id;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_NON_NULL(trace, "Trace");
 	BT_ASSERT_PRE(stream_class->assigns_automatic_stream_id,
@@ -179,6 +163,7 @@ struct bt_stream *bt_stream_create(struct bt_stream_class *stream_class,
 struct bt_stream *bt_stream_create_with_id(struct bt_stream_class *stream_class,
 		struct bt_trace *trace, uint64_t id)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_NON_NULL(trace, "Trace");
 	BT_ASSERT_PRE(!stream_class->assigns_automatic_stream_id,
@@ -220,6 +205,7 @@ const char *bt_stream_get_name(const struct bt_stream *stream)
 enum bt_stream_set_name_status bt_stream_set_name(struct bt_stream *stream,
 		const char *name)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
 	BT_ASSERT_PRE_DEV_STREAM_HOT(stream);