Set private port's user data on creation

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

diff --git a/lib/graph/source.c b/lib/graph/source.c
index 0c4f1817c91e7584efda10238a43d6c47c11dad6..e76959b8722b53f046f39d0466b338fc75daf87f 100644 (file)
--- a/lib/graph/source.c
+++ b/lib/graph/source.c
@@ -79,23 +79,23 @@ end:
        return source ? &source->parent : NULL;
 }
 
-enum bt_component_status bt_component_source_get_output_port_count(
+int64_t bt_component_source_get_output_port_count(
                struct bt_component *component, uint64_t *count)
 {
-       enum bt_component_status status = BT_COMPONENT_STATUS_OK;
+       int64_t ret;
 
        if (!component || !count ||
                        component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) {
-               status = BT_COMPONENT_STATUS_INVALID;
+               ret = (int64_t) -1;
                goto end;
        }
 
-       *count = bt_component_get_output_port_count(component);
+       ret = bt_component_get_output_port_count(component);
 end:
-       return status;
+       return ret;
 }
 
-struct bt_port *bt_component_source_get_output_port(
+struct bt_port *bt_component_source_get_output_port_by_name(
                struct bt_component *component, const char *name)
 {
        struct bt_port *port = NULL;
@@ -105,13 +105,13 @@ struct bt_port *bt_component_source_get_output_port(
                goto end;
        }
 
-       port = bt_component_get_output_port(component, name);
+       port = bt_component_get_output_port_by_name(component, name);
 end:
        return port;
 }
 
-struct bt_port *bt_component_source_get_output_port_at_index(
-               struct bt_component *component, int index)
+struct bt_port *bt_component_source_get_output_port_by_index(
+               struct bt_component *component, uint64_t index)
 {
        struct bt_port *port = NULL;
 
@@ -120,7 +120,7 @@ struct bt_port *bt_component_source_get_output_port_at_index(
                goto end;
        }
 
-       port = bt_component_get_output_port_at_index(component, index);
+       port = bt_component_get_output_port_by_index(component, index);
 end:
        return port;
 }
@@ -128,24 +128,26 @@ end:
 struct bt_port *bt_component_source_get_default_output_port(
                struct bt_component *component)
 {
-       return bt_component_source_get_output_port(component,
+       return bt_component_source_get_output_port_by_name(component,
                        DEFAULT_OUTPUT_PORT_NAME);
 }
 
-struct bt_private_port *bt_private_component_source_get_output_private_port(
+struct bt_private_port *
+bt_private_component_source_get_output_private_port_by_name(
                struct bt_private_component *private_component,
                const char *name)
 {
-       return bt_private_port_from_port(bt_component_source_get_output_port(
-               bt_component_from_private(private_component), name));
+       return bt_private_port_from_port(
+               bt_component_source_get_output_port_by_name(
+                       bt_component_from_private(private_component), name));
 }
 
 struct bt_private_port *
-bt_private_component_source_get_output_private_port_at_index(
-               struct bt_private_component *private_component, int index)
+bt_private_component_source_get_output_private_port_by_index(
+               struct bt_private_component *private_component, uint64_t index)
 {
        return bt_private_port_from_port(
-               bt_component_source_get_output_port_at_index(
+               bt_component_source_get_output_port_by_index(
                        bt_component_from_private(private_component), index));
 }
 
@@ -159,7 +161,7 @@ struct bt_private_port *bt_private_component_source_get_default_output_private_p
 
 struct bt_private_port *bt_private_component_source_add_output_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 =
@@ -170,7 +172,7 @@ struct bt_private_port *bt_private_component_source_add_output_private_port(
                goto end;
        }
 
-       port = bt_component_add_output_port(component, name);
+       port = bt_component_add_output_port(component, name, user_data);
 end:
        return bt_private_port_from_port(port);
 }