X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Fplugin%2Fplugin.h;h=202c69bede6cee35272eec13c569059d909abaf1;hp=edaad960f0a4738e746e07ac4ee604570268980b;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hpb=7151fb67130ebbdc531424a4b87461e781da001f

diff --git a/src/lib/plugin/plugin.h b/src/lib/plugin/plugin.h
index edaad960..202c69be 100644
--- a/src/lib/plugin/plugin.h
+++ b/src/lib/plugin/plugin.h
@@ -34,10 +34,11 @@
 #include <glib.h>
 
 #include "plugin-so.h"
+#include "lib/func-status.h"
 
 /* Protection: this file uses BT_LIB_LOG*() macros directly */
 #ifndef BT_LIB_LOG_SUPPORTED
-# error Please include "lib/lib-logging.h" before including this file.
+# error Please include "lib/logging.h" before including this file.
 #endif
 
 enum bt_plugin_type {
@@ -45,12 +46,6 @@ enum bt_plugin_type {
 	BT_PLUGIN_TYPE_PYTHON = 1,
 };
 
-enum bt_plugin_status {
-	BT_PLUGIN_STATUS_OK = 0,
-	BT_PLUGIN_STATUS_ERROR = -1,
-	BT_PLUGIN_STATUS_NOMEM = -12,
-};
-
 struct bt_plugin {
 	struct bt_object base;
 	enum bt_plugin_type type;
@@ -93,21 +88,6 @@ struct bt_plugin_set {
 	GPtrArray *plugins;
 };
 
-static inline
-const char *bt_plugin_status_string(enum bt_plugin_status status)
-{
-	switch (status) {
-	case BT_PLUGIN_STATUS_OK:
-		return "BT_PLUGIN_STATUS_OK";
-	case BT_PLUGIN_STATUS_ERROR:
-		return "BT_PLUGIN_STATUS_ERROR";
-	case BT_PLUGIN_STATUS_NOMEM:
-		return "BT_PLUGIN_STATUS_NOMEM";
-	default:
-		return "(unknown)";
-	}
-}
-
 static inline
 const char *bt_plugin_type_string(enum bt_plugin_type type)
 {
@@ -349,7 +329,7 @@ void bt_plugin_set_version(struct bt_plugin *plugin, unsigned int major,
 }
 
 static inline
-enum bt_plugin_status bt_plugin_add_component_class(
+int bt_plugin_add_component_class(
 	struct bt_plugin *plugin, struct bt_component_class *comp_class)
 {
 	GPtrArray *comp_classes;
@@ -382,7 +362,7 @@ enum bt_plugin_status bt_plugin_add_component_class(
 
 	BT_LIB_LOGD("Added component class to plugin: "
 		"%![plugin-]+l, %![cc-]+C", plugin, comp_class);
-	return BT_PLUGIN_STATUS_OK;
+	return BT_FUNC_STATUS_OK;
 }
 
 static