X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Ferror.c;h=21e92c4cac0c0358ba6bf7297c166649f5014be7;hp=3ae2db988865b5416abcaabaeb648bed81d95528;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=6c373cc905e907ecbad698fee38db1d47a981b14

diff --git a/src/lib/error.c b/src/lib/error.c
index 3ae2db98..21e92c4c 100644
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -1,23 +1,7 @@
 /*
- * Copyright (c) 2019 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:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * 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 (c) 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/ERROR"
@@ -261,7 +245,7 @@ void append_component_class_id_str(GString *str,
 		type_str = "sink";
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	if (comp_class_id->plugin_name->len > 0) {
@@ -363,12 +347,13 @@ end:
 	return cause;
 }
 
+static
 struct bt_error_cause_message_iterator_actor *
 create_error_cause_message_iterator_actor(struct bt_message_iterator *iter,
 		const char *file_name, uint64_t line_no)
 {
 	struct bt_error_cause_message_iterator_actor *cause;
-	struct bt_self_component_port_input_message_iterator *input_port_iter;
+	struct bt_message_iterator *input_port_iter;
 	int ret;
 
 	BT_LOGD_STR("Creating error cause object (message iterator actor).");