Replace add_iterator methods by a single new_connection method

[babeltrace.git] / lib / component / component-class.c

diff --git a/lib/component/component-class.c b/lib/component/component-class.c
index fa71bc94bc71439a47e1e615f982eafbe11fe15f..0843e0c25d71030ff327fefb6bf4ccaf79bbd59f 100644 (file)
--- a/lib/component/component-class.c
+++ b/lib/component/component-class.c
@@ -245,6 +245,24 @@ end:
        return ret;
 }
 
+int bt_component_class_set_new_connection_method(
+               struct bt_component_class *component_class,
+               bt_component_class_new_connection_method new_connection_method)
+{
+       int ret = 0;
+
+       if (!component_class || component_class->frozen ||
+                       !new_connection_method) {
+               ret = -1;
+               goto end;
+       }
+
+       component_class->methods.new_connection_method = new_connection_method;
+
+end:
+       return ret;
+}
+
 int bt_component_class_set_destroy_method(
                struct bt_component_class *component_class,
                bt_component_class_destroy_method destroy_method)
@@ -481,51 +499,6 @@ end:
        return ret;
 }
 
-extern int bt_component_class_sink_set_add_iterator_method(
-               struct bt_component_class *component_class,
-               bt_component_class_sink_add_iterator_method add_iterator_method)
-{
-       struct bt_component_class_sink *sink_class;
-       int ret = 0;
-
-       if (!component_class || component_class->frozen ||
-                       !add_iterator_method ||
-                       component_class->type != BT_COMPONENT_CLASS_TYPE_SINK) {
-               ret = -1;
-               goto end;
-       }
-
-       sink_class = container_of(component_class,
-               struct bt_component_class_sink, parent);
-       sink_class->methods.add_iterator = add_iterator_method;
-
-end:
-       return ret;
-}
-
-extern int bt_component_class_filter_set_add_iterator_method(
-               struct bt_component_class *component_class,
-               bt_component_class_filter_add_iterator_method add_iterator_method)
-{
-       struct bt_component_class_filter *filter_class;
-       int ret = 0;
-
-       if (!component_class || component_class->frozen ||
-                       !add_iterator_method ||
-                       component_class->type !=
-                       BT_COMPONENT_CLASS_TYPE_FILTER) {
-               ret = -1;
-               goto end;
-       }
-
-       filter_class = container_of(component_class,
-               struct bt_component_class_filter, parent);
-       filter_class->methods.add_iterator = add_iterator_method;
-
-end:
-       return ret;
-}
-
 int bt_component_class_freeze(
                struct bt_component_class *component_class)
 {