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

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

diff --git a/lib/graph/component-class.c b/lib/graph/component-class.c
index 2e7b3c9c40d3bf5bb6d2c8bb110814e26ec5e682..5a306fb80019ad152f1ed97c83cd7819c1af5ff7 100644 (file)
--- a/lib/graph/component-class.c
+++ b/lib/graph/component-class.c
@@ -31,8 +31,9 @@
 
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/graph/component-class-internal.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
 #include <babeltrace/types.h>
+#include <babeltrace/assert-internal.h>
 #include <glib.h>
 
 static
@@ -41,7 +42,7 @@ void bt_component_class_destroy(struct bt_object *obj)
        struct bt_component_class *class;
        int i;
 
-       assert(obj);
+       BT_ASSERT(obj);
        class = container_of(obj, struct bt_component_class, base);
 
        BT_LOGD("Destroying component class: "
@@ -83,7 +84,7 @@ int bt_component_class_init(struct bt_component_class *class,
 {
        int ret = 0;
 
-       bt_object_init(class, bt_component_class_destroy);
+       bt_object_init_shared(&class->base, bt_component_class_destroy);
        class->type = type;
        class->name = g_string_new(name);
        if (!class->name) {
@@ -113,7 +114,7 @@ int bt_component_class_init(struct bt_component_class *class,
        goto end;
 
 error:
-       BT_PUT(class);
+       BT_OBJECT_PUT_REF_AND_RESET(class);
        ret = -1;
 
 end:
@@ -824,8 +825,8 @@ void bt_component_class_add_destroy_listener(struct bt_component_class *class,
 {
        struct bt_component_class_destroy_listener listener;
 
-       assert(class);
-       assert(func);
+       BT_ASSERT(class);
+       BT_ASSERT(func);
        listener.func = func;
        listener.data = data;
        g_array_append_val(class->destroy_listeners, listener);