lib: rename "self comp. input port message iter." -> "message iterator"

[babeltrace.git] / src / lib / error.c

diff --git a/src/lib/error.c b/src/lib/error.c
index bb2c3ad607960cfb97b15ea0e0c626e02c1a9474..65638b9394436d0e93c2a632f214b20c646cba19 100644 (file)
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -25,8 +25,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <babeltrace2/error-const.h>
-#include <babeltrace2/error-cause-const.h>
+#include <babeltrace2/babeltrace.h>
 
 #include "error.h"
 #include "graph/message/iterator.h"
@@ -262,7 +261,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) {
@@ -364,12 +363,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).");
@@ -379,8 +379,6 @@ create_error_cause_message_iterator_actor(struct bt_message_iterator *iter,
         * message iterator, which is a self component port input
         * message iterator.
         */
-       BT_ASSERT(iter->type ==
-               BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT);
        input_port_iter = (void *) iter;
        cause = g_new0(struct bt_error_cause_message_iterator_actor, 1);
        if (!cause) {