From: Michael Jeanson Date: Thu, 11 Jul 2019 19:35:11 +0000 (-0400) Subject: fix: use g_setenv for portability X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=c5d7b1f0da2b7b5d9f3d7d61445baaeab0e9fef2 fix: use g_setenv for portability setenv is not available on Windows and we already use g_setenv everywhere else in the code base. Signed-off-by: Michael Jeanson Change-Id: I2d39aa0777ad7bbf15c9d8c94f67cc18268c6835 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1691 Reviewed-by: Philippe Proulx Tested-by: jenkins --- diff --git a/src/cli/babeltrace2-cfg-cli-args-default.c b/src/cli/babeltrace2-cfg-cli-args-default.c index b73457a2..823d8436 100644 --- a/src/cli/babeltrace2-cfg-cli-args-default.c +++ b/src/cli/babeltrace2-cfg-cli-args-default.c @@ -21,6 +21,8 @@ * SOFTWARE. */ +#include + #include #include "babeltrace2-cfg.h" #include "babeltrace2-cfg-cli-args.h" @@ -58,14 +60,14 @@ struct bt_config *bt_config_cli_args_create_with_default(int argc, * plugin provider, if the env variable is already set, do not overwrite * it. */ - setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", CONFIG_IN_TREE_PROVIDER_DIR, 0); + g_setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", CONFIG_IN_TREE_PROVIDER_DIR, 0); #else /* * If the Pyhton plugin provider is disabled, use a non-exitent path to avoid * loading the system installed provider if it exit, if the env variable is * already set, do not overwrite it. */ - setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", "/nonexistent", 0); + g_setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", "/nonexistent", 0); #endif cfg = bt_config_cli_args_create(argc, argv, retcode, true, true,