Set private port's user data on creation

[babeltrace.git] / plugins / utils / muxer / muxer.c

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index 033a0abb574cb424ce55cbbd9f05f596168c69e4..475dbf61866c331e97525fbb889a9c9dd605220b 100644 (file)
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -173,7 +173,7 @@ int ensure_available_input_port(struct bt_private_component *priv_comp)
 
        g_string_append_printf(port_name, "%u", muxer_comp->next_port_num);
        priv_port = bt_private_component_filter_add_input_private_port(
-               priv_comp, port_name->str);
+               priv_comp, port_name->str, NULL);
        if (!priv_port) {
                ret = -1;
                goto end;
@@ -228,7 +228,7 @@ int create_output_port(struct bt_private_component *priv_comp)
        int ret = 0;
 
        priv_port = bt_private_component_filter_add_output_private_port(
-               priv_comp, "out");
+               priv_comp, "out", NULL);
        if (!priv_port) {
                ret = -1;
        }
@@ -548,7 +548,7 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
                goto error;
        }
 
-       if (!bt_ctf_clock_class_get_is_absolute(clock_class)) {
+       if (!bt_ctf_clock_class_is_absolute(clock_class)) {
                // TODO: Allow this with an explicit parameter
                goto error;
        }
@@ -802,8 +802,8 @@ int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp,
                struct muxer_notif_iter *muxer_notif_iter)
 {
        struct bt_component *comp;
-       uint64_t count;
-       uint64_t i;
+       int64_t count;
+       int64_t i;
        int ret = 0;
 
        /*
@@ -813,14 +813,14 @@ int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp,
         */
        comp = bt_component_from_private_component(muxer_comp->priv_comp);
        assert(comp);
-       ret = bt_component_filter_get_input_port_count(comp, &count);
-       if (ret) {
+       count = bt_component_filter_get_input_port_count(comp);
+       if (count < 0) {
                goto end;
        }
 
        for (i = 0; i < count; i++) {
                struct bt_private_port *priv_port =
-                       bt_private_component_filter_get_input_private_port_at_index(
+                       bt_private_component_filter_get_input_private_port_by_index(
                                muxer_comp->priv_comp, i);
                struct bt_port *port;