X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-cfg-cli-args.c;h=0a7721a70baa48d37a05287e511baa7fca574ab7;hb=d93c8ed4462f058e149624ccba1374ec7a38c2ab;hp=748738af3df8450b7abecd14d3a6418e394697f8;hpb=ca914e549e4ff113292102d27edd6af662b860d3;p=babeltrace.git

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index 748738af..0a7721a7 100644
--- a/src/cli/babeltrace2-cfg-cli-args.c
+++ b/src/cli/babeltrace2-cfg-cli-args.c
@@ -735,7 +735,7 @@ int insert_flat_params_from_array(GString *params_arg,
 		const bt_value *names_array, const char *prefix)
 {
 	int ret = 0;
-	int i;
+	uint64_t i;
 	GString *tmpstr = NULL, *default_value = NULL;
 	bool default_set = false, non_default_set = false;
 
@@ -764,16 +764,10 @@ int insert_flat_params_from_array(GString *params_arg,
 	for (i = 0; i < bt_value_array_get_length(names_array); i++) {
 		const bt_value *str_obj =
 			bt_value_array_borrow_element_by_index_const(names_array,
-								     i);
+				i);
 		const char *suffix;
 		bool is_default = false;
 
-		if (!str_obj) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected error.");
-			ret = -1;
-			goto end;
-		}
-
 		suffix = bt_value_string_get(str_obj);
 
 		g_string_assign(tmpstr, prefix);
@@ -1480,12 +1474,14 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[],
 	struct bt_config *cfg = NULL;
 	const char *component_class_spec = NULL;
 	const char *query_object = NULL;
-	bt_value *params;
 	GString *error_str = NULL;
 	struct bt_argpar_parse_ret argpar_parse_ret = { 0 };
 
-	params = bt_value_null;
-	bt_value_get_ref(bt_value_null);
+	bt_value *params = bt_value_map_create();
+	if (!params) {
+		BT_CLI_LOGE_APPEND_CAUSE_OOM();
+		goto error;
+	}
 
 	*retcode = 0;
 	cfg = bt_config_query_create(plugin_paths);
@@ -1527,13 +1523,21 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[],
 			switch (argpar_item_opt->descr->id) {
 			case OPT_PARAMS:
 			{
-				bt_value_put_ref(params);
-				params = bt_param_parse(arg, error_str);
-				if (!params) {
+				bt_value *parsed_params = bt_param_parse(arg, error_str);
+				bt_value_map_extend_status extend_status;
+				if (!parsed_params) {
 					BT_CLI_LOGE_APPEND_CAUSE("Invalid format for --params option's argument:\n    %s",
 						error_str->str);
 					goto error;
 				}
+
+				extend_status = bt_value_map_extend(params, parsed_params);
+				BT_VALUE_PUT_REF_AND_RESET(parsed_params);
+				if (extend_status) {
+					BT_CLI_LOGE_APPEND_CAUSE("Cannot extend current parameters with --params option's argument:\n    %s",
+						arg);
+					goto error;
+				}
 				break;
 			}
 			default:
@@ -2063,33 +2067,27 @@ struct bt_config *bt_config_run_from_args_array(const bt_value *run_args,
 {
 	struct bt_config *cfg = NULL;
 	const char **argv;
-	int64_t i, len;
-	const size_t argc = bt_value_array_get_length(run_args);
+	uint64_t i, len = bt_value_array_get_length(run_args);
 
-	argv = calloc(argc, sizeof(*argv));
+	BT_ASSERT(len <= SIZE_MAX);
+	argv = calloc((size_t) len, sizeof(*argv));
 	if (!argv) {
 		BT_CLI_LOGE_APPEND_CAUSE_OOM();
 		goto end;
 	}
 
-	len = bt_value_array_get_length(run_args);
-	if (len < 0) {
-		BT_CLI_LOGE_APPEND_CAUSE("Invalid executable arguments.");
-		goto end;
-	}
 	for (i = 0; i < len; i++) {
 		const bt_value *arg_value =
 			bt_value_array_borrow_element_by_index_const(run_args,
-								     i);
+				i);
 		const char *arg;
 
-		BT_ASSERT(arg_value);
 		arg = bt_value_string_get(arg_value);
 		BT_ASSERT(arg);
 		argv[i] = arg;
 	}
 
-	cfg = bt_config_run_from_args(argc, argv, retcode,
+	cfg = bt_config_run_from_args((int) len, argv, retcode,
 		plugin_paths, default_log_level);
 
 end:
@@ -2347,7 +2345,7 @@ int append_run_args_for_implicit_component(
 		bt_value *run_args)
 {
 	int ret = 0;
-	size_t i;
+	uint64_t i;
 	GString *component_arg_for_run = NULL;
 
 	if (!impl_args->exists) {
@@ -2390,16 +2388,12 @@ int append_run_args_for_implicit_component(
 		}
 	}
 
-	for (i = 0; i < bt_value_array_get_length(impl_args->extra_params);
-			i++) {
+	for (i = 0; i < bt_value_array_get_length(impl_args->extra_params); i++) {
 		const bt_value *elem;
 		const char *arg;
 
-		elem = bt_value_array_borrow_element_by_index(impl_args->extra_params,
-							      i);
-		if (!elem) {
-			goto error;
-		}
+		elem = bt_value_array_borrow_element_by_index(
+			impl_args->extra_params, i);
 
 		BT_ASSERT(bt_value_is_string(elem));
 		arg = bt_value_string_get(elem);
@@ -2601,7 +2595,6 @@ int bt_value_to_cli_param_value_append(const bt_value *value, GString *buf)
 		uint64_t sz = bt_value_array_get_length(value);
 		for (uint64_t i = 0; i < sz; i++) {
 			const bt_value *item;
-			int ret;
 
 			if (i > 0) {
 				g_string_append(buf, ", ");
@@ -4329,20 +4322,21 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	 * here.
 	 */
 	if (print_run_args || print_run_args_0) {
+		uint64_t args_idx, args_len;
 		if (stream_intersection_mode) {
 			BT_CLI_LOGE_APPEND_CAUSE("Cannot specify --stream-intersection with --run-args or --run-args-0.");
 			goto error;
 		}
 
-		for (i = 0; i < bt_value_array_get_length(run_args); i++) {
+		args_len = bt_value_array_get_length(run_args);
+		for (args_idx = 0; args_idx < args_len; args_idx++) {
 			const bt_value *arg_value =
 				bt_value_array_borrow_element_by_index(run_args,
-								       i);
+					args_idx);
 			const char *arg;
 			GString *quoted = NULL;
 			const char *arg_to_print;
 
-			BT_ASSERT(arg_value);
 			arg = bt_value_string_get(arg_value);
 
 			if (print_run_args) {
@@ -4362,7 +4356,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				g_string_free(quoted, TRUE);
 			}
 
-			if (i < bt_value_array_get_length(run_args) - 1) {
+			if (args_idx < args_len - 1) {
 				if (print_run_args) {
 					putchar(' ');
 				} else {