lib: private functions: do not repeat `private` word

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

diff --git a/lib/graph/port.c b/lib/graph/port.c
index 950a0a26528133327ffc8675beb3cd40b87f1f9a..6660c66aeebad3fdea2dcf3fc614158060d9e5ad 100644 (file)
--- a/lib/graph/port.c
+++ b/lib/graph/port.c
@@ -85,17 +85,17 @@ struct bt_port *bt_port_create(struct bt_component *parent_component,
                parent_component, bt_component_get_name(parent_component),
                bt_port_type_string(type), name);
 
-       bt_object_init(port, bt_port_destroy);
+       bt_object_init_shared_with_parent(&port->base, bt_port_destroy);
        port->name = g_string_new(name);
        if (!port->name) {
                BT_LOGE_STR("Failed to allocate one GString.");
-               BT_PUT(port);
+               BT_OBJECT_PUT_REF_AND_RESET(port);
                goto end;
        }
 
        port->type = type;
        port->user_data = user_data;
-       bt_object_set_parent(port, &parent_component->base);
+       bt_object_set_parent(&port->base, &parent_component->base);
        BT_LOGD("Created port for component: "
                "comp-addr=%p, comp-name=\"%s\", port-type=%s, "
                "port-name=\"%s\", port-addr=%p",
@@ -130,7 +130,7 @@ struct bt_connection *bt_port_get_connection(struct bt_port *port)
                goto end;
        }
 
-       connection = bt_get(port->connection);
+       connection = bt_object_get_ref(port->connection);
 
 end:
        return connection;
@@ -138,17 +138,17 @@ end:
 
 struct bt_component *bt_port_get_component(struct bt_port *port)
 {
-       return (struct bt_component *) bt_object_get_parent(port);
+       return (struct bt_component *) bt_object_get_parent(&port->base);
 }
 
-struct bt_private_connection *bt_private_port_get_private_connection(
+struct bt_private_connection *bt_private_port_get_connection(
                struct bt_private_port *private_port)
 {
        return bt_private_connection_from_connection(bt_port_get_connection(
                bt_port_borrow_from_private(private_port)));
 }
 
-struct bt_private_component *bt_private_port_get_private_component(
+struct bt_private_component *bt_private_port_get_component(
                struct bt_private_port *private_port)
 {
        return bt_private_component_from_component(bt_port_get_component(
@@ -184,7 +184,7 @@ enum bt_port_status bt_private_port_remove_from_component(
                goto end;
        }
 
-       comp = (void *) bt_object_get_parent(port);
+       comp = (void *) bt_object_get_parent(&port->base);
        if (!comp) {
                BT_LOGV("Port already removed from its component: "
                        "port-addr=%p, port-name=\"%s\", ",
@@ -201,7 +201,7 @@ enum bt_port_status bt_private_port_remove_from_component(
        }
 
 end:
-       bt_put(comp);
+       bt_object_put_ref(comp);
        return status;
 }