lib: update and simplify the `bt_object` API

[babeltrace.git] / lib / plugin / plugin-so.c

diff --git a/lib/plugin/plugin-so.c b/lib/plugin/plugin-so.c
index 1d0425ba7c20392fdda38a12316a4211715ca20e..648f95d1e5af7521a3e5b7fb52d30d5a0b78e3d9 100644 (file)
--- a/lib/plugin/plugin-so.c
+++ b/lib/plugin/plugin-so.c
@@ -39,6 +39,7 @@
 #include <babeltrace/graph/component-class-internal.h>
 #include <babeltrace/types.h>
 #include <babeltrace/list-internal.h>
+#include <babeltrace/assert-internal.h>
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
@@ -105,7 +106,7 @@ void bt_plugin_so_shared_lib_handle_destroy(struct bt_object *obj)
 {
        struct bt_plugin_so_shared_lib_handle *shared_lib_handle;
 
-       assert(obj);
+       BT_ASSERT(obj);
        shared_lib_handle = container_of(obj,
                struct bt_plugin_so_shared_lib_handle, base);
        const char *path = shared_lib_handle->path ?
@@ -174,7 +175,8 @@ struct bt_plugin_so_shared_lib_handle *bt_plugin_so_shared_lib_handle_create(
                goto error;
        }
 
-       bt_object_init(shared_lib_handle, bt_plugin_so_shared_lib_handle_destroy);
+       bt_object_init_shared(&shared_lib_handle->base,
+               bt_plugin_so_shared_lib_handle_destroy);
 
        if (!path) {
                goto end;
@@ -223,8 +225,8 @@ void bt_plugin_so_destroy_spec_data(struct bt_plugin *plugin)
                return;
        }
 
-       assert(plugin->type == BT_PLUGIN_TYPE_SO);
-       assert(spec);
+       BT_ASSERT(plugin->type == BT_PLUGIN_TYPE_SO);
+       BT_ASSERT(spec);
        BT_PUT(spec->shared_lib_handle);
        g_free(plugin->spec_data);
        plugin->spec_data = NULL;
@@ -282,7 +284,7 @@ enum bt_plugin_status bt_plugin_so_init(
                bt_component_class_accept_port_connection_method accept_port_connection_method;
                bt_component_class_port_connected_method port_connected_method;
                bt_component_class_port_disconnected_method port_disconnected_method;
-               struct bt_component_class_iterator_methods iterator_methods;
+               struct bt_component_class_notification_iterator_methods iterator_methods;
        };
 
        enum bt_plugin_status status = BT_PLUGIN_STATUS_OK;
@@ -1132,8 +1134,8 @@ void bt_plugin_so_on_add_component_class(struct bt_plugin *plugin,
 {
        struct bt_plugin_so_spec_data *spec = plugin->spec_data;
 
-       assert(plugin->spec_data);
-       assert(plugin->type == BT_PLUGIN_TYPE_SO);
+       BT_ASSERT(plugin->spec_data);
+       BT_ASSERT(plugin->type == BT_PLUGIN_TYPE_SO);
 
        bt_list_add(&comp_class->node, &component_class_list);
        comp_class->so_handle = bt_get(spec->shared_lib_handle);