X-Git-Url: https://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-cfg-cli-args-default.c;h=0e657720bc5788a489a047d4bc0f8daddb344ca2;hp=e75b187178ee18d76a69bf5a857a6f205b1f3700;hb=353c2524c2d4606a79ac5f4c0354a683a14e63e5;hpb=a80892bab38643e037d92efae2a9d0de1e006785

diff --git a/src/cli/babeltrace2-cfg-cli-args-default.c b/src/cli/babeltrace2-cfg-cli-args-default.c
index e75b1871..0e657720 100644
--- a/src/cli/babeltrace2-cfg-cli-args-default.c
+++ b/src/cli/babeltrace2-cfg-cli-args-default.c
@@ -14,12 +14,12 @@
 
 #ifdef BT_SET_DEFAULT_IN_TREE_CONFIGURATION
 
-struct bt_config *bt_config_cli_args_create_with_default(int argc,
-		const char *argv[], int *retcode,
+enum bt_config_cli_args_status bt_config_cli_args_create_with_default(int argc,
+		const char *argv[], struct bt_config **cfg,
 		const bt_interrupter *interrupter)
 {
+	enum bt_config_cli_args_status status;
 	bt_value *initial_plugin_paths;
-	struct bt_config *cfg = NULL;
 	int ret;
 
 	initial_plugin_paths = bt_value_array_create();
@@ -49,26 +49,25 @@ struct bt_config *bt_config_cli_args_create_with_default(int argc,
 	g_setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", "/nonexistent", 0);
 #endif
 
-	cfg = bt_config_cli_args_create(argc, argv, retcode, true, true,
+	status = bt_config_cli_args_create(argc, argv, cfg, true, true,
 		initial_plugin_paths, interrupter);
 	goto end;
 
 error:
-	*retcode = 1;
-	BT_OBJECT_PUT_REF_AND_RESET(cfg);
+	status = BT_CONFIG_CLI_ARGS_STATUS_ERROR;
 
 end:
 	bt_value_put_ref(initial_plugin_paths);
-	return cfg;
+	return status;
 }
 
 #else /* BT_SET_DEFAULT_IN_TREE_CONFIGURATION */
 
-struct bt_config *bt_config_cli_args_create_with_default(int argc,
-		const char *argv[], int *retcode,
+enum bt_config_cli_args_status bt_config_cli_args_create_with_default(int argc,
+		const char *argv[], struct bt_config **cfg,
 		const bt_interrupter *interrupter)
 {
-	return bt_config_cli_args_create(argc, argv, retcode, false, false,
+	return bt_config_cli_args_create(argc, argv, cfg, false, false,
 		NULL, interrupter);
 }