Rename: bt_put(), bt_get() -> bt_object_put_ref(), bt_object_get_ref()

[babeltrace.git] / lib / graph / filter.c

diff --git a/lib/graph/filter.c b/lib/graph/filter.c
index 6cae9b3b76da2e163f94bd1ccc49fbe44e91fe51..539443efe977e7052985eb8ac9d8f8692a37169a 100644 (file)
--- a/lib/graph/filter.c
+++ b/lib/graph/filter.c
@@ -31,6 +31,7 @@
 
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/values.h>
+#include <babeltrace/graph/private-component.h>
 #include <babeltrace/graph/component-filter-internal.h>
 #include <babeltrace/graph/component-internal.h>
 #include <babeltrace/graph/component-class-internal.h>
@@ -45,7 +46,7 @@ void bt_component_filter_destroy(struct bt_component *component)
 
 BT_HIDDEN
 struct bt_component *bt_component_filter_create(
-               struct bt_component_class *class, struct bt_value *params)
+               struct bt_component_class *class)
 {
        struct bt_component_filter *filter = NULL;
 
@@ -229,7 +230,7 @@ bt_private_component_filter_get_input_private_port_by_index(
        /* bt_component_filter_get_input_port_by_index() logs details/errors */
        return bt_private_port_from_port(
                bt_component_filter_get_input_port_by_index(
-                       bt_component_from_private(private_component), index));
+                       bt_component_borrow_from_private(private_component), index));
 }
 
 struct bt_private_port *
@@ -240,7 +241,7 @@ bt_private_component_filter_get_input_private_port_by_name(
        /* bt_component_filter_get_input_port_by_name() logs details/errors */
        return bt_private_port_from_port(
                bt_component_filter_get_input_port_by_name(
-                       bt_component_from_private(private_component), name));
+                       bt_component_borrow_from_private(private_component), name));
 }
 
 enum bt_component_status bt_private_component_filter_add_input_private_port(
@@ -251,7 +252,7 @@ enum bt_component_status bt_private_component_filter_add_input_private_port(
        enum bt_component_status status = BT_COMPONENT_STATUS_OK;
        struct bt_port *port = NULL;
        struct bt_component *component =
-               bt_component_from_private(private_component);
+               bt_component_borrow_from_private(private_component);
        struct bt_graph *graph;
 
        if (!component) {
@@ -272,7 +273,7 @@ enum bt_component_status bt_private_component_filter_add_input_private_port(
        graph = bt_component_borrow_graph(component);
 
        if (graph && bt_graph_is_canceled(graph)) {
-               BT_LOGW("Cannot add output port to filter component: graph is canceled: "
+               BT_LOGW("Cannot add input port to filter component: graph is canceled: "
                        "comp-addr=%p, comp-name=\"%s\", graph-addr=%p",
                        component, bt_component_get_name(component),
                        bt_component_borrow_graph(component));
@@ -294,7 +295,7 @@ enum bt_component_status bt_private_component_filter_add_input_private_port(
        }
 
 end:
-       bt_put(port);
+       bt_object_put_ref(port);
        return status;
 }
 
@@ -305,7 +306,7 @@ bt_private_component_filter_get_output_private_port_by_index(
        /* bt_component_filter_get_output_port_by_index() logs details/errors */
        return bt_private_port_from_port(
                bt_component_filter_get_output_port_by_index(
-                       bt_component_from_private(private_component), index));
+                       bt_component_borrow_from_private(private_component), index));
 }
 
 struct bt_private_port *
@@ -316,7 +317,7 @@ bt_private_component_filter_get_output_private_port_by_name(
        /* bt_component_filter_get_output_port_by_name() logs details/errors */
        return bt_private_port_from_port(
                bt_component_filter_get_output_port_by_name(
-                       bt_component_from_private(private_component), name));
+                       bt_component_borrow_from_private(private_component), name));
 }
 
 enum bt_component_status bt_private_component_filter_add_output_private_port(
@@ -327,7 +328,7 @@ enum bt_component_status bt_private_component_filter_add_output_private_port(
        enum bt_component_status status = BT_COMPONENT_STATUS_OK;
        struct bt_port *port = NULL;
        struct bt_component *component =
-               bt_component_from_private(private_component);
+               bt_component_borrow_from_private(private_component);
        struct bt_graph *graph;
 
        if (!component) {
@@ -370,6 +371,6 @@ enum bt_component_status bt_private_component_filter_add_output_private_port(
        }
 
 end:
-       bt_put(port);
+       bt_object_put_ref(port);
        return status;
 }