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

[babeltrace.git] / src / plugins / ctf / common / metadata / ctf-meta-translate.c

diff --git a/src/plugins/ctf/common/metadata/ctf-meta-translate.c b/src/plugins/ctf/common/metadata/ctf-meta-translate.c
index b7f2cbdb1a0bb44c689fafdc1a3c1e69fbf9a744..1499a7f9545c43fbb57ed09356b2e50a3e779aae 100644 (file)
--- a/src/plugins/ctf/common/metadata/ctf-meta-translate.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-translate.c
@@ -16,6 +16,7 @@
 #include "common/macros.h"
 #include "common/assert.h"
 #include <glib.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 #include <inttypes.h>
@@ -115,11 +116,11 @@ bt_field_class *ctf_field_class_enum_to_ir(struct ctx *ctx,
                if (fc->base.is_signed) {
                        ret = bt_field_class_enumeration_signed_add_mapping(
                                ir_fc, mapping->label->str, range_set);
-                       BT_RANGE_SET_SIGNED_PUT_REF_AND_RESET(range_set);
+                       BT_INTEGER_RANGE_SET_SIGNED_PUT_REF_AND_RESET(range_set);
                } else {
                        ret = bt_field_class_enumeration_unsigned_add_mapping(
                                ir_fc, mapping->label->str, range_set);
-                       BT_RANGE_SET_UNSIGNED_PUT_REF_AND_RESET(range_set);
+                       BT_INTEGER_RANGE_SET_UNSIGNED_PUT_REF_AND_RESET(range_set);
                }
 
                BT_ASSERT(ret == 0);
@@ -302,7 +303,7 @@ bt_field_class *ctf_field_class_variant_to_ir(struct ctx *ctx,
                                        bt_field_class_enumeration_signed_mapping_borrow_ranges_const(
                                                mapping);
                                BT_ASSERT(range_set);
-                               ret = bt_field_class_variant_with_selector_signed_append_option(
+                               ret = bt_field_class_variant_with_selector_field_integer_signed_append_option(
                                        ir_fc, named_fc->name->str,
                                        option_ir_fc, range_set);
                        } else {
@@ -318,7 +319,7 @@ bt_field_class *ctf_field_class_variant_to_ir(struct ctx *ctx,
                                        bt_field_class_enumeration_unsigned_mapping_borrow_ranges_const(
                                                mapping);
                                BT_ASSERT(range_set);
-                               ret = bt_field_class_variant_with_selector_unsigned_append_option(
+                               ret = bt_field_class_variant_with_selector_field_integer_unsigned_append_option(
                                        ir_fc, named_fc->name->str,
                                        option_ir_fc, range_set);
                        }
@@ -426,7 +427,7 @@ bt_field_class *ctf_field_class_to_ir(struct ctx *ctx,
                ir_fc = ctf_field_class_variant_to_ir(ctx, (void *) fc);
                break;
        default:
-               abort();
+               bt_common_abort();
        }
 
        fc->ir_fc = ir_fc;
@@ -484,7 +485,7 @@ bt_field_class *scope_ctf_field_class_to_ir(struct ctx *ctx)
                fc = ctx->ec->payload_fc;
                break;
        default:
-               abort();
+               bt_common_abort();
        }
 
        if (fc && ctf_field_class_struct_has_immediate_member_in_ir(