X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fsink.c;h=e99d111f4309fa87711fe4331a47bad66b5fd0f4;hb=b9d103befd837c4411112257c2619ef8d68225dd;hp=49bd840249a8f8434d1295af9424345589e65719;hpb=c5504f7322f93b32b4bcc65a950ed61efadd694a;p=babeltrace.git

diff --git a/lib/graph/sink.c b/lib/graph/sink.c
index 49bd8402..e99d111f 100644
--- a/lib/graph/sink.c
+++ b/lib/graph/sink.c
@@ -100,23 +100,22 @@ end:
 	return ret;
 }
 
-enum bt_component_status bt_component_sink_get_input_port_count(
-		struct bt_component *component, uint64_t *count)
+int64_t bt_component_sink_get_input_port_count(struct bt_component *component)
 {
-	enum bt_component_status status = BT_COMPONENT_STATUS_OK;
+	int64_t ret;
 
-	if (!component || !count ||
+	if (!component ||
 			component->class->type != BT_COMPONENT_CLASS_TYPE_SINK) {
-	        status = BT_COMPONENT_STATUS_INVALID;
+	        ret = (int64_t) -1;
 		goto end;
 	}
 
-	*count = bt_component_get_input_port_count(component);
+	ret = bt_component_get_input_port_count(component);
 end:
-	return status;
+	return ret;
 }
 
-struct bt_port *bt_component_sink_get_input_port(
+struct bt_port *bt_component_sink_get_input_port_by_name(
 		struct bt_component *component, const char *name)
 {
 	struct bt_port *port = NULL;
@@ -126,13 +125,13 @@ struct bt_port *bt_component_sink_get_input_port(
 		goto end;
 	}
 
-	port = bt_component_get_input_port(component, name);
+	port = bt_component_get_input_port_by_name(component, name);
 end:
 	return port;
 }
 
-struct bt_port *bt_component_sink_get_input_port_at_index(
-		struct bt_component *component, int index)
+struct bt_port *bt_component_sink_get_input_port_by_index(
+		struct bt_component *component, uint64_t index)
 {
 	struct bt_port *port = NULL;
 
@@ -141,38 +140,33 @@ struct bt_port *bt_component_sink_get_input_port_at_index(
 		goto end;
 	}
 
-	port = bt_component_get_input_port_at_index(component, index);
+	port = bt_component_get_input_port_by_index(component, index);
 end:
 	return port;
 }
 
-struct bt_port *bt_component_sink_get_default_input_port(
-		struct bt_component *component)
-{
-	return bt_component_sink_get_input_port(component,
-			DEFAULT_INPUT_PORT_NAME);
-}
-
 struct bt_private_port *
-bt_private_component_sink_get_input_private_port_at_index(
-		struct bt_private_component *private_component, int index)
+bt_private_component_sink_get_input_private_port_by_index(
+		struct bt_private_component *private_component, uint64_t index)
 {
 	return bt_private_port_from_port(
-		bt_component_sink_get_input_port_at_index(
+		bt_component_sink_get_input_port_by_index(
 			bt_component_from_private(private_component), index));
 }
 
-struct bt_private_port *bt_private_component_sink_get_default_input_private_port(
-		struct bt_private_component *private_component)
+struct bt_private_port *
+bt_private_component_sink_get_input_private_port_by_name(
+		struct bt_private_component *private_component,
+		const char *name)
 {
 	return bt_private_port_from_port(
-		bt_component_sink_get_default_input_port(
-			bt_component_from_private(private_component)));
+		bt_component_sink_get_input_port_by_name(
+			bt_component_from_private(private_component), name));
 }
 
 struct bt_private_port *bt_private_component_sink_add_input_private_port(
 		struct bt_private_component *private_component,
-		const char *name)
+		const char *name, void *user_data)
 {
 	struct bt_port *port = NULL;
 	struct bt_component *component =
@@ -183,7 +177,7 @@ struct bt_private_port *bt_private_component_sink_add_input_private_port(
 		goto end;
 	}
 
-	port = bt_component_add_input_port(component, name);
+	port = bt_component_add_input_port(component, name, user_data);
 end:
 	return bt_private_port_from_port(port);
 }