common: move bt_component_class_type_string here, use it more

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

diff --git a/src/lib/plugin/plugin-so.c b/src/lib/plugin/plugin-so.c
index 6025bdec19ae829ab2922301467d4518fa1d35b9..3017e6c0af167d5850b134cf6321f2e1c675b62c 100644 (file)
--- a/src/lib/plugin/plugin-so.c
+++ b/src/lib/plugin/plugin-so.c
@@ -9,7 +9,7 @@
 #include "lib/logging.h"
 
 #include "common/assert.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "compat/compiler.h"
 #include <babeltrace2/plugin/plugin-dev.h>
 #include "lib/graph/component-class.h"
@@ -686,7 +686,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin,
                                                        NULL,
                                                descriptor->name,
                                                cur_cc_descr_attr->comp_class_descriptor->name,
-                                               bt_component_class_type_string(
+                                               bt_common_component_class_type_string(
                                                        cur_cc_descr_attr->comp_class_descriptor->type),
                                                cur_cc_descr_attr->type_name,
                                                cur_cc_descr_attr->type);
@@ -706,7 +706,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin,
                                                        NULL,
                                                descriptor->name,
                                                cur_cc_descr_attr->comp_class_descriptor->name,
-                                               bt_component_class_type_string(
+                                               bt_common_component_class_type_string(
                                                        cur_cc_descr_attr->comp_class_descriptor->type),
                                                cur_cc_descr_attr->type_name,
                                                cur_cc_descr_attr->type);
@@ -766,7 +766,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin,
                                NULL,
                        descriptor->name,
                        cc_full_descr->descriptor->name,
-                       bt_component_class_type_string(
+                       bt_common_component_class_type_string(
                                cc_full_descr->descriptor->type));
 
                if (cc_full_descr->descriptor->type == BT_COMPONENT_CLASS_TYPE_SOURCE ||