X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-cfg-cli-args.c;h=f0c64a3f18e8a7b67aad05d129ae6a87d5f2b16d;hb=04439d6577dddc7453ff951bf90dc181c70af39d;hp=c6401e1085f65563fe02bbe60877289b4953dc35;hpb=deb34b1f2c9e32a082d219b2d80b017fd0fa0fc6;p=babeltrace.git

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index c6401e10..f0c64a3f 100644
--- a/src/cli/babeltrace2-cfg-cli-args.c
+++ b/src/cli/babeltrace2-cfg-cli-args.c
@@ -452,7 +452,7 @@ void bt_config_destroy(bt_object *obj)
 		}
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	g_free(cfg);
@@ -488,9 +488,9 @@ GScanner *create_csv_identifiers_scanner(void)
 {
 	GScanner *scanner;
 	GScannerConfig scanner_config = {
-		.cset_skip_characters = " \t\n",
-		.cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "_",
-		.cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z ":_-",
+		.cset_skip_characters = (gchar *) " \t\n",
+		.cset_identifier_first = (gchar *) G_CSET_a_2_z G_CSET_A_2_Z "_",
+		.cset_identifier_nth = (gchar *) G_CSET_a_2_z G_CSET_A_2_Z ":_-",
 		.case_sensitive = TRUE,
 		.cpair_comment_single = NULL,
 		.skip_comment_multi = TRUE,
@@ -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);
@@ -892,7 +886,7 @@ void add_run_cfg_comp(struct bt_config *cfg,
 		g_ptr_array_add(cfg->cmd_data.run.sinks, cfg_comp);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 }
 
@@ -1906,7 +1900,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 				dest = BT_CONFIG_COMPONENT_DEST_SINK;
 				break;
 			default:
-				abort();
+				bt_common_abort();
 			}
 
 			BT_ASSERT(cur_base_params);
@@ -2073,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:
@@ -2357,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) {
@@ -2400,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);
@@ -2611,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, ", ");
@@ -2629,7 +2612,7 @@ int bt_value_to_cli_param_value_append(const bt_value *value, GString *buf)
 		break;
 	}
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	ret = 0;
@@ -3441,7 +3424,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 					sink_names = g_list_append(sink_names, name_gstr);
 					break;
 				default:
-					abort();
+					bt_common_abort();
 				}
 				name_gstr = NULL;
 
@@ -3601,7 +3584,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				goto error;
 			}
 		} else {
-			abort();
+			bt_common_abort();
 		}
 	}
 
@@ -4339,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) {
@@ -4372,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 {
@@ -4629,14 +4613,19 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
 
 			if (strcmp(item_non_opt->arg, "convert") == 0) {
 				command_type = COMMAND_TYPE_CONVERT;
+				command_name = "convert";
 			} else if (strcmp(item_non_opt->arg, "list-plugins") == 0) {
 				command_type = COMMAND_TYPE_LIST_PLUGINS;
+				command_name = "list-plugins";
 			} else if (strcmp(item_non_opt->arg, "help") == 0) {
 				command_type = COMMAND_TYPE_HELP;
+				command_name = "help";
 			} else if (strcmp(item_non_opt->arg, "query") == 0) {
 				command_type = COMMAND_TYPE_QUERY;
+				command_name = "query";
 			} else if (strcmp(item_non_opt->arg, "run") == 0) {
 				command_type = COMMAND_TYPE_RUN;
+				command_name = "run";
 			} else {
 				/*
 				 * Non-option argument, but not a known
@@ -4729,7 +4718,7 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
 			default_log_level);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	if (config) {