Add bt_common_abort() and use it instead of abort() directly

[babeltrace.git] / src / cli / babeltrace2-cfg-cli-args.c

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index e8465b224749b8753a3cd525f9334952dc281a49..57ccabf3713ae24a914409b0f9234ca22e1c6d6b 100644 (file)
--- 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,
@@ -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);
@@ -2085,10 +2079,9 @@ struct bt_config *bt_config_run_from_args_array(const bt_value *run_args,
        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;
@@ -2399,11 +2392,8 @@ int append_run_args_for_implicit_component(
                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);
@@ -2622,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;
@@ -3434,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;
 
@@ -3594,7 +3584,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                                goto error;
                        }
                } else {
-                       abort();
+                       bt_common_abort();
                }
        }
 
@@ -4347,7 +4337,6 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        GString *quoted = NULL;
                        const char *arg_to_print;
 
-                       BT_ASSERT(arg_value);
                        arg = bt_value_string_get(arg_value);
 
                        if (print_run_args) {
@@ -4724,7 +4713,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) {