X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=cli%2Fbabeltrace-cfg-cli-args-default.c;h=ec7b4803993e4cd474dafbcbb84a65d17ac45b3f;hb=19bdff207149e8d07bfa141901b887b8d979896c;hp=0617b59dcf3359683a20bd0046a7f9cb2f96ce12;hpb=9009cc24dc1634ba03cbdfe6c37831f8b1ba95d3;p=babeltrace.git

diff --git a/cli/babeltrace-cfg-cli-args-default.c b/cli/babeltrace-cfg-cli-args-default.c
index 0617b59d..ec7b4803 100644
--- a/cli/babeltrace-cfg-cli-args-default.c
+++ b/cli/babeltrace-cfg-cli-args-default.c
@@ -21,17 +21,23 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/values.h>
+#include <babeltrace/babeltrace.h>
 #include "babeltrace-cfg.h"
 #include "babeltrace-cfg-cli-args.h"
 #include "babeltrace-cfg-cli-args-default.h"
 
+#ifdef ENABLE_DEBUG_INFO
+# define BT_ENABLE_DEBUG_INFO	1
+#else
+# define BT_ENABLE_DEBUG_INFO	0
+#endif
+
 #ifdef BT_SET_DEFAULT_IN_TREE_CONFIGURATION
 
 struct bt_config *bt_config_cli_args_create_with_default(int argc,
 		const char *argv[], int *retcode)
 {
-	struct bt_value *initial_plugin_paths;
+	bt_value *initial_plugin_paths;
 	struct bt_config *cfg = NULL;
 	int ret;
 
@@ -47,15 +53,15 @@ struct bt_config *bt_config_cli_args_create_with_default(int argc,
 	}
 
 	cfg = bt_config_cli_args_create(argc, argv, retcode, true, true,
-		BT_ENABLE_DEBUG_INFO == 0, initial_plugin_paths);
+		initial_plugin_paths);
 	goto end;
 
 error:
 	*retcode = 1;
-	BT_PUT(cfg);
+	BT_OBJECT_PUT_REF_AND_RESET(cfg);
 
 end:
-	bt_put(initial_plugin_paths);
+	bt_value_put_ref(initial_plugin_paths);
 	return cfg;
 }
 
@@ -65,7 +71,7 @@ struct bt_config *bt_config_cli_args_create_with_default(int argc,
 		const char *argv[], int *retcode)
 {
 	return bt_config_cli_args_create(argc, argv, retcode, false, false,
-		BT_ENABLE_DEBUG_INFO == 0, NULL);
+		NULL);
 }
 
 #endif /* BT_SET_DEFAULT_IN_TREE_CONFIGURATION */