lib: standardize variant field option function names

[babeltrace.git] / src / plugins / lttng-utils / debug-info / trace-ir-data-copy.c

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
index 19ad1f2f3b8f2cf68bdccdf26749945382520dab..9f0f32af26170c3ff80aa7fd4cdec756bb3e67b2 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
@@ -32,6 +32,7 @@
 #include <stdint.h>
 
 #include "common/assert.h"
+#include "common/common.h"
 
 #include "trace-ir-data-copy.h"
 
@@ -103,7 +104,7 @@ enum debug_info_trace_ir_mapping_status copy_trace_content(
                                out_trace, value_name,
                                bt_value_string_get(value));
                } else {
-                       abort();
+                       bt_common_abort();
                }
 
                if (set_env_status != BT_TRACE_SET_ENVIRONMENT_ENTRY_STATUS_OK) {
@@ -422,18 +423,18 @@ enum debug_info_trace_ir_mapping_status copy_field_content(
                }
        } else if (bt_field_class_type_is(in_fc_type,
                        BT_FIELD_CLASS_TYPE_VARIANT)) {
-               bt_field_variant_select_option_field_by_index_status sel_opt_status;
+               bt_field_variant_select_option_by_index_status sel_opt_status;
                uint64_t in_selected_option_idx;
                const bt_field *in_option_field;
                bt_field *out_option_field;
 
                in_selected_option_idx =
-                       bt_field_variant_get_selected_option_field_index(
+                       bt_field_variant_get_selected_option_index(
                                in_field);
-               sel_opt_status = bt_field_variant_select_option_field_by_index(out_field,
+               sel_opt_status = bt_field_variant_select_option_by_index(out_field,
                        in_selected_option_idx);
                if (sel_opt_status !=
-                               BT_FIELD_VARIANT_SELECT_OPTION_FIELD_STATUS_OK) {
+                               BT_FIELD_VARIANT_SELECT_OPTION_STATUS_OK) {
                        BT_COMP_LOGE_APPEND_CAUSE(self_comp,
                                "Cannot select variant field's option field: "
                                "out-var-f-addr=%p, opt-index=%" PRId64,
@@ -455,7 +456,7 @@ enum debug_info_trace_ir_mapping_status copy_field_content(
                        goto end;
                        }
        } else {
-               abort();
+               bt_common_abort();
        }
 
        BT_COMP_LOGT("Copied content of field: in-f-addr=%p, out-f-addr=%p",