X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-cfg-cli-args-connect.c;h=92958ac7937fd3a0de16462fef7326fce91e7b4b;hp=7f2ff92b065a0218967ccde6f525176cac26e629;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=91d8147391efdc4d42cc4e1c171a65c0372a008f

diff --git a/src/cli/babeltrace2-cfg-cli-args-connect.c b/src/cli/babeltrace2-cfg-cli-args-connect.c
index 7f2ff92b..92958ac7 100644
--- a/src/cli/babeltrace2-cfg-cli-args-connect.c
+++ b/src/cli/babeltrace2-cfg-cli-args-connect.c
@@ -1,25 +1,10 @@
 /*
- * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -271,7 +256,7 @@ static struct bt_config_connection *cfg_connection_from_arg(const char *arg)
 			}
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 	}
 
@@ -685,7 +670,7 @@ int bt_config_cli_args_create_connections(struct bt_config *cfg,
 		char *error_buf, size_t error_buf_size)
 {
 	int ret;
-	size_t i;
+	uint64_t i;
 
 	if (!all_named_and_printable(cfg)) {
 		snprintf(error_buf, error_buf_size,
@@ -693,7 +678,7 @@ int bt_config_cli_args_create_connections(struct bt_config *cfg,
 		goto error;
 	}
 
-	for (i = 0; i < bt_value_array_get_size(connection_args); i++) {
+	for (i = 0; i < bt_value_array_get_length(connection_args); i++) {
 		const bt_value *arg_value =
 			bt_value_array_borrow_element_by_index_const(
 				connection_args, i);