X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fpython-plugin-provider%2Fpython-plugin-provider.c;h=c1cd399e92da075676939a19e65170786ea99bd4;hb=fe5ee4280c235005d2fa7eab2af14a352740d4eb;hp=c6b606564ced4e564eebdda8e0e58009defb409e;hpb=969c1d8a5c653480fe295344fece03988d101662;p=babeltrace.git

diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c
index c6b60656..c1cd399e 100644
--- a/src/python-plugin-provider/python-plugin-provider.c
+++ b/src/python-plugin-provider/python-plugin-provider.c
@@ -31,10 +31,10 @@
 
 #include "common/macros.h"
 #include "compat/compiler.h"
-#include <babeltrace2/plugin/plugin-const.h>
+#include <babeltrace2/plugin/plugin-loading.h>
 #include "lib/plugin/plugin.h"
 #include <babeltrace2/graph/component-class.h>
-#include <babeltrace2/current-thread.h>
+#include <babeltrace2/error-reporting.h>
 #include "lib/graph/component-class.h"
 #include "py-common/py-common.h"
 #include <stdbool.h>
@@ -49,7 +49,7 @@
 #define PYTHON_PLUGIN_FILE_EXT		".py"
 #define PYTHON_PLUGIN_FILE_EXT_LEN	(sizeof(PYTHON_PLUGIN_FILE_EXT) - 1)
 
-enum python_state {
+static enum python_state {
 	/* init_python() not called yet */
 	PYTHON_STATE_NOT_INITED,
 
@@ -82,7 +82,7 @@ void append_python_traceback_error_cause(void)
 		}
 
 		(void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(
-			"Babeltrace library", "%s", exc->str);
+			BT_LIB_LOG_LIBBABELTRACE2_NAME, "%s", exc->str);
 	}
 
 end:
@@ -104,7 +104,7 @@ void log_python_traceback(int log_level)
 		}
 
 		BT_LOG_WRITE(log_level, BT_LOG_TAG,
-			"Exception occured: Python traceback:\n%s", exc->str);
+			"Exception occurred: Python traceback:\n%s", exc->str);
 	}
 
 end:
@@ -143,7 +143,7 @@ int init_python(void)
 		ret = BT_FUNC_STATUS_ERROR;
 		goto end;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	/*