X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fpython-plugin-provider%2Fpython-plugin-provider.c;h=5bb4e33b729085ea080d887750ca817fafd54da3;hb=aab89afca7e58b51784bbb6da6fde0757d53fd8d;hp=765035e2df60dcde37713ffb72c2c699ba3e4b81;hpb=f33c35fbd629c3148148ae249fcd7e990fe5be4e;p=babeltrace.git

diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c
index 765035e2..5bb4e33b 100644
--- a/src/python-plugin-provider/python-plugin-provider.c
+++ b/src/python-plugin-provider/python-plugin-provider.c
@@ -145,12 +145,14 @@ int init_python(void)
 
 	/*
 	 * User can disable Python plugin support with the
-	 * BABELTRACE_DISABLE_PYTHON_PLUGINS environment variable set to
-	 * 1.
+	 * `LIBBABELTRACE2_DISABLE_PYTHON_PLUGINS` environment variable
+	 * set to 1.
 	 */
-	dis_python_env = getenv("BABELTRACE_DISABLE_PYTHON_PLUGINS");
+	dis_python_env = getenv("LIBBABELTRACE2_DISABLE_PYTHON_PLUGINS");
 	if (dis_python_env && strcmp(dis_python_env, "1") == 0) {
-		BT_LOGI_STR("Python plugin support is disabled because `BABELTRACE_DISABLE_PYTHON_PLUGINS=1`.");
+		BT_LOGI_STR("Python plugin support is disabled because the "
+			"`LIBBABELTRACE2_DISABLE_PYTHON_PLUGINS` environment "
+			"variable is set to `1`.");
 		python_state = PYTHON_STATE_WONT_INITIALIZE;
 		ret = BT_FUNC_STATUS_NOT_FOUND;
 		goto end;
@@ -250,7 +252,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Cannot find `name` attribute in Python plugin info object: "
 				"py-plugin-info-addr=%p", plugin_info);
-			status = BT_FUNC_STATUS_LOADING_ERROR;
+			status = BT_FUNC_STATUS_ERROR;
 		} else {
 			BT_LIB_LOGW(
 				"Cannot find `name` attribute in Python plugin info object: "
@@ -268,7 +270,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Cannot find `author` attribute in Python plugin info object: "
 				"py-plugin-info-addr=%p", plugin_info);
-			status = BT_FUNC_STATUS_LOADING_ERROR;
+			status = BT_FUNC_STATUS_ERROR;
 		} else {
 			BT_LIB_LOGW(
 				"Cannot find `author` attribute in Python plugin info object: "
@@ -286,7 +288,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Cannot find `description` attribute in Python plugin info object: "
 				"py-plugin-info-addr=%p", plugin_info);
-			status = BT_FUNC_STATUS_LOADING_ERROR;
+			status = BT_FUNC_STATUS_ERROR;
 		} else {
 			BT_LIB_LOGW(
 				"Cannot find `description` attribute in Python plugin info object: "
@@ -304,7 +306,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Cannot find `license` attribute in Python plugin info object: "
 				"py-plugin-info-addr=%p", plugin_info);
-			status = BT_FUNC_STATUS_LOADING_ERROR;
+			status = BT_FUNC_STATUS_ERROR;
 		} else {
 			BT_LIB_LOGW(
 				"Cannot find `license` attribute in Python plugin info object: "
@@ -322,7 +324,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Cannot find `version` attribute in Python plugin info object: "
 				"py-plugin-info-addr=%p", plugin_info);
-			status = BT_FUNC_STATUS_LOADING_ERROR;
+			status = BT_FUNC_STATUS_ERROR;
 		} else {
 			BT_LIB_LOGW(
 				"Cannot find `version` attribute in Python plugin info object: "
@@ -341,7 +343,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Cannot find `comp_class_addrs` attribute in Python plugin info object: "
 				"py-plugin-info-addr=%p", plugin_info);
-			status = BT_FUNC_STATUS_LOADING_ERROR;
+			status = BT_FUNC_STATUS_ERROR;
 		} else {
 			BT_LIB_LOGW(
 				"Cannot find `comp_class_addrs` attribute in Python plugin info object: "
@@ -360,7 +362,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 				BT_LIB_LOGW_APPEND_CAUSE(
 					"Cannot decode Python plugin name string: "
 					"py-plugin-info-addr=%p", plugin_info);
-				status = BT_FUNC_STATUS_LOADING_ERROR;
+				status = BT_FUNC_STATUS_ERROR;
 			} else {
 				BT_LIB_LOGW(
 					"Cannot decode Python plugin name string: "
@@ -377,7 +379,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Plugin name is not a string: "
 				"py-plugin-info-addr=%p", plugin_info);
-			status = BT_FUNC_STATUS_LOADING_ERROR;
+			status = BT_FUNC_STATUS_ERROR;
 		} else {
 			BT_LIB_LOGW(
 				"Plugin name is not a string: "
@@ -396,7 +398,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 				BT_LIB_LOGW_APPEND_CAUSE(
 					"Cannot decode Python plugin author string: "
 					"py-plugin-info-addr=%p", plugin_info);
-				status = BT_FUNC_STATUS_LOADING_ERROR;
+				status = BT_FUNC_STATUS_ERROR;
 			} else {
 				BT_LIB_LOGW(
 					"Cannot decode Python plugin author string: "
@@ -416,7 +418,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 				BT_LIB_LOGW_APPEND_CAUSE(
 					"Cannot decode Python plugin description string: "
 					"py-plugin-info-addr=%p", plugin_info);
-				status = BT_FUNC_STATUS_LOADING_ERROR;
+				status = BT_FUNC_STATUS_ERROR;
 			} else {
 				BT_LIB_LOGW(
 					"Cannot decode Python plugin description string: "
@@ -436,7 +438,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 				BT_LIB_LOGW_APPEND_CAUSE(
 					"Cannot decode Python plugin license string: "
 					"py-plugin-info-addr=%p", plugin_info);
-				status = BT_FUNC_STATUS_LOADING_ERROR;
+				status = BT_FUNC_STATUS_ERROR;
 			} else {
 				BT_LIB_LOGW(
 					"Cannot decode Python plugin license string: "
@@ -477,7 +479,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 					BT_LIB_LOGW_APPEND_CAUSE(
 						"Invalid Python plugin version format: "
 						"py-plugin-info-addr=%p", plugin_info);
-					status = BT_FUNC_STATUS_LOADING_ERROR;
+					status = BT_FUNC_STATUS_ERROR;
 				} else {
 					BT_LIB_LOGW(
 						"Invalid Python plugin version format: "
@@ -502,7 +504,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 						BT_LIB_LOGW_APPEND_CAUSE(
 							"Cannot decode Python plugin version's extra string: "
 							"py-plugin-info-addr=%p", plugin_info);
-						status = BT_FUNC_STATUS_LOADING_ERROR;
+						status = BT_FUNC_STATUS_ERROR;
 					} else {
 						BT_LIB_LOGW(
 							"Cannot decode Python plugin version's extra string: "
@@ -558,7 +560,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info,
 						"Component class address is not an integer in Python plugin info object: "
 						"py-plugin-info-addr=%p, index=%zu",
 						plugin_info, i);
-					status = BT_FUNC_STATUS_LOADING_ERROR;
+					status = BT_FUNC_STATUS_ERROR;
 				} else {
 					BT_LIB_LOGW(
 						"Component class address is not an integer in Python plugin info object: "
@@ -637,7 +639,9 @@ int bt_plugin_python_create_all_from_file(const char *path,
 		 * Python plugins are disabled, so it's simply not
 		 * found.
 		 */
-		BT_LOGI_STR("Python plugin support was disabled previously because `BABELTRACE_DISABLE_PYTHON_PLUGINS=1`.");
+		BT_LOGI_STR("Python plugin support was disabled previously "
+			"because the `LIBBABELTRACE2_DISABLE_PYTHON_PLUGINS` "
+			"environment variable is set to `1`.");
 		status = BT_FUNC_STATUS_NOT_FOUND;
 		goto error;
 	}
@@ -700,7 +704,7 @@ int bt_plugin_python_create_all_from_file(const char *path,
 			append_python_traceback_error_cause();
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Cannot load Python plugin: path=\"%s\"", path);
-			status = BT_FUNC_STATUS_LOADING_ERROR;
+			status = BT_FUNC_STATUS_ERROR;
 		} else {
 			BT_LIB_LOGW(
 				"Cannot load Python plugin: path=\"%s\"", path);