ir: rename ctf_type_id -> bt_ctf_type_id

[babeltrace.git] / formats / ctf / ir / event-types.c

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index 67200dac0a31b15e1a08c14df64278ca1f70238b..eab0ef4347512143ff79745d027da75b812f0583 100644 (file)
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -76,16 +76,16 @@ void bt_ctf_field_type_string_destroy(struct bt_ctf_field_type *);
 
 static
 void (* const type_destroy_funcs[])(struct bt_ctf_field_type *) = {
-       [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_destroy,
-       [CTF_TYPE_ENUM] =
+       [BT_CTF_TYPE_ID_INTEGER] = bt_ctf_field_type_integer_destroy,
+       [BT_CTF_TYPE_ID_ENUM] =
                bt_ctf_field_type_enumeration_destroy,
-       [CTF_TYPE_FLOAT] =
+       [BT_CTF_TYPE_ID_FLOAT] =
                bt_ctf_field_type_floating_point_destroy,
-       [CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_destroy,
-       [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_destroy,
-       [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_destroy,
-       [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_destroy,
-       [CTF_TYPE_STRING] = bt_ctf_field_type_string_destroy,
+       [BT_CTF_TYPE_ID_STRUCT] = bt_ctf_field_type_structure_destroy,
+       [BT_CTF_TYPE_ID_VARIANT] = bt_ctf_field_type_variant_destroy,
+       [BT_CTF_TYPE_ID_ARRAY] = bt_ctf_field_type_array_destroy,
+       [BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_type_sequence_destroy,
+       [BT_CTF_TYPE_ID_STRING] = bt_ctf_field_type_string_destroy,
 };
 
 static
@@ -103,14 +103,14 @@ void bt_ctf_field_type_sequence_freeze(struct bt_ctf_field_type *);
 
 static
 type_freeze_func const type_freeze_funcs[] = {
-       [CTF_TYPE_INTEGER] = generic_field_type_freeze,
-       [CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_freeze,
-       [CTF_TYPE_FLOAT] = generic_field_type_freeze,
-       [CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_freeze,
-       [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_freeze,
-       [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_freeze,
-       [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_freeze,
-       [CTF_TYPE_STRING] = generic_field_type_freeze,
+       [BT_CTF_TYPE_ID_INTEGER] = generic_field_type_freeze,
+       [BT_CTF_TYPE_ID_ENUM] = bt_ctf_field_type_enumeration_freeze,
+       [BT_CTF_TYPE_ID_FLOAT] = generic_field_type_freeze,
+       [BT_CTF_TYPE_ID_STRUCT] = bt_ctf_field_type_structure_freeze,
+       [BT_CTF_TYPE_ID_VARIANT] = bt_ctf_field_type_variant_freeze,
+       [BT_CTF_TYPE_ID_ARRAY] = bt_ctf_field_type_array_freeze,
+       [BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_type_sequence_freeze,
+       [BT_CTF_TYPE_ID_STRING] = generic_field_type_freeze,
 };
 
 static
@@ -140,17 +140,17 @@ int bt_ctf_field_type_string_serialize(struct bt_ctf_field_type *,
 
 static
 type_serialize_func const type_serialize_funcs[] = {
-       [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_serialize,
-       [CTF_TYPE_ENUM] =
+       [BT_CTF_TYPE_ID_INTEGER] = bt_ctf_field_type_integer_serialize,
+       [BT_CTF_TYPE_ID_ENUM] =
                bt_ctf_field_type_enumeration_serialize,
-       [CTF_TYPE_FLOAT] =
+       [BT_CTF_TYPE_ID_FLOAT] =
                bt_ctf_field_type_floating_point_serialize,
-       [CTF_TYPE_STRUCT] =
+       [BT_CTF_TYPE_ID_STRUCT] =
                bt_ctf_field_type_structure_serialize,
-       [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_serialize,
-       [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_serialize,
-       [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_serialize,
-       [CTF_TYPE_STRING] = bt_ctf_field_type_string_serialize,
+       [BT_CTF_TYPE_ID_VARIANT] = bt_ctf_field_type_variant_serialize,
+       [BT_CTF_TYPE_ID_ARRAY] = bt_ctf_field_type_array_serialize,
+       [BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_type_sequence_serialize,
+       [BT_CTF_TYPE_ID_STRING] = bt_ctf_field_type_string_serialize,
 };
 
 static
@@ -179,17 +179,17 @@ void bt_ctf_field_type_sequence_set_byte_order(struct bt_ctf_field_type *,
 static
 void (* const set_byte_order_funcs[])(struct bt_ctf_field_type *,
                int byte_order, int set_native) = {
-       [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_set_byte_order,
-       [CTF_TYPE_ENUM] =
+       [BT_CTF_TYPE_ID_INTEGER] = bt_ctf_field_type_integer_set_byte_order,
+       [BT_CTF_TYPE_ID_ENUM] =
                bt_ctf_field_type_enumeration_set_byte_order,
-       [CTF_TYPE_FLOAT] =
+       [BT_CTF_TYPE_ID_FLOAT] =
                bt_ctf_field_type_floating_point_set_byte_order,
-       [CTF_TYPE_STRUCT] =
+       [BT_CTF_TYPE_ID_STRUCT] =
                bt_ctf_field_type_structure_set_byte_order,
-       [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_set_byte_order,
-       [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_set_byte_order,
-       [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_set_byte_order,
-       [CTF_TYPE_STRING] = NULL,
+       [BT_CTF_TYPE_ID_VARIANT] = bt_ctf_field_type_variant_set_byte_order,
+       [BT_CTF_TYPE_ID_ARRAY] = bt_ctf_field_type_array_set_byte_order,
+       [BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_type_sequence_set_byte_order,
+       [BT_CTF_TYPE_ID_STRING] = NULL,
 };
 
 static
@@ -220,14 +220,14 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_copy(
 static
 struct bt_ctf_field_type *(* const type_copy_funcs[])(
                struct bt_ctf_field_type *) = {
-       [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_copy,
-       [CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_copy,
-       [CTF_TYPE_FLOAT] = bt_ctf_field_type_floating_point_copy,
-       [CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_copy,
-       [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_copy,
-       [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_copy,
-       [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_copy,
-       [CTF_TYPE_STRING] = bt_ctf_field_type_string_copy,
+       [BT_CTF_TYPE_ID_INTEGER] = bt_ctf_field_type_integer_copy,
+       [BT_CTF_TYPE_ID_ENUM] = bt_ctf_field_type_enumeration_copy,
+       [BT_CTF_TYPE_ID_FLOAT] = bt_ctf_field_type_floating_point_copy,
+       [BT_CTF_TYPE_ID_STRUCT] = bt_ctf_field_type_structure_copy,
+       [BT_CTF_TYPE_ID_VARIANT] = bt_ctf_field_type_variant_copy,
+       [BT_CTF_TYPE_ID_ARRAY] = bt_ctf_field_type_array_copy,
+       [BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_type_sequence_copy,
+       [BT_CTF_TYPE_ID_STRING] = bt_ctf_field_type_string_copy,
 };
 
 static
@@ -258,14 +258,14 @@ int bt_ctf_field_type_sequence_compare(struct bt_ctf_field_type *,
 static
 int (* const type_compare_funcs[])(struct bt_ctf_field_type *,
                struct bt_ctf_field_type *) = {
-       [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_compare,
-       [CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_compare,
-       [CTF_TYPE_FLOAT] = bt_ctf_field_type_floating_point_compare,
-       [CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_compare,
-       [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_compare,
-       [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_compare,
-       [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_compare,
-       [CTF_TYPE_STRING] = bt_ctf_field_type_string_compare,
+       [BT_CTF_TYPE_ID_INTEGER] = bt_ctf_field_type_integer_compare,
+       [BT_CTF_TYPE_ID_ENUM] = bt_ctf_field_type_enumeration_compare,
+       [BT_CTF_TYPE_ID_FLOAT] = bt_ctf_field_type_floating_point_compare,
+       [BT_CTF_TYPE_ID_STRUCT] = bt_ctf_field_type_structure_compare,
+       [BT_CTF_TYPE_ID_VARIANT] = bt_ctf_field_type_variant_compare,
+       [BT_CTF_TYPE_ID_ARRAY] = bt_ctf_field_type_array_compare,
+       [BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_type_sequence_compare,
+       [BT_CTF_TYPE_ID_STRING] = bt_ctf_field_type_string_compare,
 };
 
 static
@@ -281,14 +281,14 @@ int bt_ctf_field_type_sequence_validate(struct bt_ctf_field_type *);
 
 static
 int (* const type_validate_funcs[])(struct bt_ctf_field_type *) = {
-       [CTF_TYPE_INTEGER] = NULL,
-       [CTF_TYPE_FLOAT] = NULL,
-       [CTF_TYPE_STRING] = NULL,
-       [CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_validate,
-       [CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_validate,
-       [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_validate,
-       [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_validate,
-       [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_validate,
+       [BT_CTF_TYPE_ID_INTEGER] = NULL,
+       [BT_CTF_TYPE_ID_FLOAT] = NULL,
+       [BT_CTF_TYPE_ID_STRING] = NULL,
+       [BT_CTF_TYPE_ID_ENUM] = bt_ctf_field_type_enumeration_validate,
+       [BT_CTF_TYPE_ID_STRUCT] = bt_ctf_field_type_structure_validate,
+       [BT_CTF_TYPE_ID_VARIANT] = bt_ctf_field_type_variant_validate,
+       [BT_CTF_TYPE_ID_ARRAY] = bt_ctf_field_type_array_validate,
+       [BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_type_sequence_validate,
 };
 
 static
@@ -355,10 +355,10 @@ gint compare_enumeration_mappings_unsigned(struct enumeration_mapping **a,
 static
 void bt_ctf_field_type_init(struct bt_ctf_field_type *type, int init_bo)
 {
-       enum ctf_type_id type_id = type->declaration->id;
+       enum bt_ctf_type_id type_id = type->declaration->id;
 
-       assert(type && (type_id > CTF_TYPE_UNKNOWN) &&
-               (type_id < NR_CTF_TYPES));
+       assert(type && (type_id > BT_CTF_TYPE_ID_UNKNOWN) &&
+               (type_id < BT_CTF_NR_TYPE_IDS));
 
        bt_object_init(type, bt_ctf_field_type_destroy);
        type->freeze = type_freeze_funcs[type_id];
@@ -411,12 +411,12 @@ static
 void bt_ctf_field_type_destroy(struct bt_object *obj)
 {
        struct bt_ctf_field_type *type;
-       enum ctf_type_id type_id;
+       enum bt_ctf_type_id type_id;
 
        type = container_of(obj, struct bt_ctf_field_type, base);
        type_id = type->declaration->id;
-       if (type_id <= CTF_TYPE_UNKNOWN ||
-               type_id >= NR_CTF_TYPES) {
+       if (type_id <= BT_CTF_TYPE_ID_UNKNOWN ||
+               type_id >= BT_CTF_NR_TYPE_IDS) {
                return;
        }
 
@@ -624,7 +624,7 @@ BT_HIDDEN
 int bt_ctf_field_type_validate(struct bt_ctf_field_type *type)
 {
        int ret = 0;
-       enum ctf_type_id id = bt_ctf_field_type_get_type_id(type);
+       enum bt_ctf_type_id id = bt_ctf_field_type_get_type_id(type);
 
        if (!type) {
                ret = -1;
@@ -659,7 +659,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_integer_create(unsigned int size)
        }
 
        integer->parent.declaration = &integer->declaration.p;
-       integer->parent.declaration->id = CTF_TYPE_INTEGER;
+       integer->parent.declaration->id = BT_CTF_TYPE_ID_INTEGER;
        integer->declaration.len = size;
        integer->declaration.base = BT_CTF_INTEGER_BASE_DECIMAL;
        integer->declaration.encoding = BT_CTF_STRING_ENCODING_NONE;
@@ -672,7 +672,7 @@ int bt_ctf_field_type_integer_get_size(struct bt_ctf_field_type *type)
        int ret = 0;
        struct bt_ctf_field_type_integer *integer;
 
-       if (!type || type->declaration->id != CTF_TYPE_INTEGER) {
+       if (!type || type->declaration->id != BT_CTF_TYPE_ID_INTEGER) {
                ret = -1;
                goto end;
        }
@@ -688,7 +688,7 @@ int bt_ctf_field_type_integer_get_signed(struct bt_ctf_field_type *type)
        int ret = 0;
        struct bt_ctf_field_type_integer *integer;
 
-       if (!type || type->declaration->id != CTF_TYPE_INTEGER) {
+       if (!type || type->declaration->id != BT_CTF_TYPE_ID_INTEGER) {
                ret = -1;
                goto end;
        }
@@ -706,7 +706,7 @@ int bt_ctf_field_type_integer_set_signed(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_integer *integer;
 
        if (!type || type->frozen ||
-               type->declaration->id != CTF_TYPE_INTEGER) {
+               type->declaration->id != BT_CTF_TYPE_ID_INTEGER) {
                ret = -1;
                goto end;
        }
@@ -723,7 +723,7 @@ enum bt_ctf_integer_base bt_ctf_field_type_integer_get_base(
        enum bt_ctf_integer_base ret = BT_CTF_INTEGER_BASE_UNKNOWN;
        struct bt_ctf_field_type_integer *integer;
 
-       if (!type || type->declaration->id != CTF_TYPE_INTEGER) {
+       if (!type || type->declaration->id != BT_CTF_TYPE_ID_INTEGER) {
                goto end;
        }
 
@@ -739,7 +739,7 @@ int bt_ctf_field_type_integer_set_base(struct bt_ctf_field_type *type,
        int ret = 0;
 
        if (!type || type->frozen ||
-               type->declaration->id != CTF_TYPE_INTEGER) {
+               type->declaration->id != BT_CTF_TYPE_ID_INTEGER) {
                ret = -1;
                goto end;
        }
@@ -768,7 +768,7 @@ enum bt_ctf_string_encoding bt_ctf_field_type_integer_get_encoding(
        enum bt_ctf_string_encoding ret = BT_CTF_STRING_ENCODING_UNKNOWN;
        struct bt_ctf_field_type_integer *integer;
 
-       if (!type || type->declaration->id != CTF_TYPE_INTEGER) {
+       if (!type || type->declaration->id != BT_CTF_TYPE_ID_INTEGER) {
                goto end;
        }
 
@@ -785,7 +785,7 @@ int bt_ctf_field_type_integer_set_encoding(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_integer *integer;
 
        if (!type || type->frozen ||
-               (type->declaration->id != CTF_TYPE_INTEGER) ||
+               (type->declaration->id != BT_CTF_TYPE_ID_INTEGER) ||
                (encoding < BT_CTF_STRING_ENCODING_NONE) ||
                (encoding >= BT_CTF_STRING_ENCODING_UNKNOWN)) {
                ret = -1;
@@ -844,7 +844,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_create(
                goto error;
        }
 
-       if (integer_container_type->declaration->id != CTF_TYPE_INTEGER) {
+       if (integer_container_type->declaration->id != BT_CTF_TYPE_ID_INTEGER) {
                goto error;
        }
 
@@ -854,7 +854,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_create(
        }
 
        enumeration->parent.declaration = &enumeration->declaration.p;
-       enumeration->parent.declaration->id = CTF_TYPE_ENUM;
+       enumeration->parent.declaration->id = BT_CTF_TYPE_ID_ENUM;
        bt_get(integer_container_type);
        enumeration->container = integer_container_type;
        enumeration->entries = g_ptr_array_new_with_free_func(
@@ -876,7 +876,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_get_container_type(
                goto end;
        }
 
-       if (type->declaration->id != CTF_TYPE_ENUM) {
+       if (type->declaration->id != BT_CTF_TYPE_ID_ENUM) {
                goto end;
        }
 
@@ -899,7 +899,7 @@ int bt_ctf_field_type_enumeration_add_mapping(
        struct range_overlap_query query;
        char *escaped_string;
 
-       if (!type || (type->declaration->id != CTF_TYPE_ENUM) ||
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_ENUM) ||
                type->frozen ||
                (range_end < range_start)) {
                ret = -1;
@@ -962,7 +962,7 @@ int bt_ctf_field_type_enumeration_add_mapping_unsigned(
        struct range_overlap_query query;
        char *escaped_string;
 
-       if (!type || (type->declaration->id != CTF_TYPE_ENUM) ||
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_ENUM) ||
                type->frozen ||
                (range_end < range_start)) {
                ret = -1;
@@ -1066,7 +1066,7 @@ int bt_ctf_field_type_enumeration_get_mapping_count(
        int ret = 0;
        struct bt_ctf_field_type_enumeration *enumeration;
 
-       if (!type || (type->declaration->id != CTF_TYPE_ENUM)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_ENUM)) {
                ret = -1;
                goto end;
        }
@@ -1104,7 +1104,7 @@ int bt_ctf_field_type_enumeration_get_mapping(
        int ret = 0;
 
        if (!type || index < 0 || !string || !range_start || !range_end ||
-               (type->declaration->id != CTF_TYPE_ENUM)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_ENUM)) {
                ret = -1;
                goto end;
        }
@@ -1130,7 +1130,7 @@ int bt_ctf_field_type_enumeration_get_mapping_unsigned(
        int ret = 0;
 
        if (!type || index < 0 || !string || !range_start || !range_end ||
-               (type->declaration->id != CTF_TYPE_ENUM)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_ENUM)) {
                ret = -1;
                goto end;
        }
@@ -1156,7 +1156,7 @@ int bt_ctf_field_type_enumeration_get_mapping_index_by_name(
        int i, ret = 0;
 
        if (!type || !name ||
-               (type->declaration->id != CTF_TYPE_ENUM)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_ENUM)) {
                ret = -1;
                goto end;
        }
@@ -1190,7 +1190,7 @@ int bt_ctf_field_type_enumeration_get_mapping_index_by_value(
        struct bt_ctf_field_type_enumeration *enumeration;
        int i, ret = 0;
 
-       if (!type || (type->declaration->id != CTF_TYPE_ENUM)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_ENUM)) {
                ret = -1;
                goto end;
        }
@@ -1219,7 +1219,7 @@ int bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(
        struct bt_ctf_field_type_enumeration *enumeration;
        int i, ret = 0;
 
-       if (!type || (type->declaration->id != CTF_TYPE_ENUM)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_ENUM)) {
                ret = -1;
                goto end;
        }
@@ -1256,7 +1256,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_floating_point_create(void)
        floating_point->declaration.exp = &floating_point->exp;
        floating_point->sign.len = 1;
        floating_point->parent.declaration = &floating_point->declaration.p;
-       floating_point->parent.declaration->id = CTF_TYPE_FLOAT;
+       floating_point->parent.declaration->id = BT_CTF_TYPE_ID_FLOAT;
        floating_point->declaration.exp->len =
                sizeof(float) * CHAR_BIT - FLT_MANT_DIG;
        floating_point->declaration.mantissa->len = FLT_MANT_DIG - 1;
@@ -1275,7 +1275,7 @@ int bt_ctf_field_type_floating_point_get_exponent_digits(
        int ret = 0;
        struct bt_ctf_field_type_floating_point *floating_point;
 
-       if (!type || (type->declaration->id != CTF_TYPE_FLOAT)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_FLOAT)) {
                ret = -1;
                goto end;
        }
@@ -1295,7 +1295,7 @@ int bt_ctf_field_type_floating_point_set_exponent_digits(
        struct bt_ctf_field_type_floating_point *floating_point;
 
        if (!type || type->frozen ||
-               (type->declaration->id != CTF_TYPE_FLOAT)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_FLOAT)) {
                ret = -1;
                goto end;
        }
@@ -1321,7 +1321,7 @@ int bt_ctf_field_type_floating_point_get_mantissa_digits(
        int ret = 0;
        struct bt_ctf_field_type_floating_point *floating_point;
 
-       if (!type || (type->declaration->id != CTF_TYPE_FLOAT)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_FLOAT)) {
                ret = -1;
                goto end;
        }
@@ -1341,7 +1341,7 @@ int bt_ctf_field_type_floating_point_set_mantissa_digits(
        struct bt_ctf_field_type_floating_point *floating_point;
 
        if (!type || type->frozen ||
-               (type->declaration->id != CTF_TYPE_FLOAT)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_FLOAT)) {
                ret = -1;
                goto end;
        }
@@ -1371,7 +1371,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_create(void)
        }
 
        structure->parent.declaration = &structure->declaration.p;
-       structure->parent.declaration->id = CTF_TYPE_STRUCT;
+       structure->parent.declaration->id = BT_CTF_TYPE_ID_STRUCT;
        structure->fields = g_ptr_array_new_with_free_func(
                (GDestroyNotify)destroy_structure_field);
        structure->field_name_to_index = g_hash_table_new(NULL, NULL);
@@ -1390,7 +1390,7 @@ int bt_ctf_field_type_structure_add_field(struct bt_ctf_field_type *type,
 
        if (!type || !field_type || type->frozen ||
                bt_ctf_validate_identifier(field_name) ||
-               (type->declaration->id != CTF_TYPE_STRUCT)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_STRUCT)) {
                ret = -1;
                goto end;
        }
@@ -1412,7 +1412,7 @@ int bt_ctf_field_type_structure_get_field_count(
        int ret = 0;
        struct bt_ctf_field_type_structure *structure;
 
-       if (!type || (type->declaration->id != CTF_TYPE_STRUCT)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_STRUCT)) {
                ret = -1;
                goto end;
        }
@@ -1432,7 +1432,8 @@ int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type,
        struct structure_field *field;
        int ret = 0;
 
-       if (!type || index < 0 || (type->declaration->id != CTF_TYPE_STRUCT)) {
+       if (!type || index < 0 ||
+                       (type->declaration->id != BT_CTF_TYPE_ID_STRUCT)) {
                ret = -1;
                goto end;
        }
@@ -1504,7 +1505,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create(
        }
 
        variant->parent.declaration = &variant->declaration.p;
-       variant->parent.declaration->id = CTF_TYPE_VARIANT;
+       variant->parent.declaration->id = BT_CTF_TYPE_ID_VARIANT;
        variant->tag_name = g_string_new(tag_name);
        variant->field_name_to_index = g_hash_table_new(NULL, NULL);
        variant->fields = g_ptr_array_new_with_free_func(
@@ -1529,7 +1530,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_tag_type(
        struct bt_ctf_field_type_variant *variant;
        struct bt_ctf_field_type *tag_type = NULL;
 
-       if (!type || (type->declaration->id != CTF_TYPE_VARIANT)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_VARIANT)) {
                goto end;
        }
 
@@ -1550,7 +1551,7 @@ const char *bt_ctf_field_type_variant_get_tag_name(
        struct bt_ctf_field_type_variant *variant;
        const char *tag_name = NULL;
 
-       if (!type || (type->declaration->id != CTF_TYPE_VARIANT)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_VARIANT)) {
                goto end;
        }
 
@@ -1571,7 +1572,7 @@ int bt_ctf_field_type_variant_set_tag_name(
        struct bt_ctf_field_type_variant *variant;
 
        if (!type || type->frozen ||
-               (type->declaration->id != CTF_TYPE_VARIANT) ||
+               (type->declaration->id != BT_CTF_TYPE_ID_VARIANT) ||
                bt_ctf_validate_identifier(name)) {
                ret = -1;
                goto end;
@@ -1594,7 +1595,7 @@ int bt_ctf_field_type_variant_add_field(struct bt_ctf_field_type *type,
 
        if (!type || !field_type || type->frozen ||
                bt_ctf_validate_identifier(field_name) ||
-               (type->declaration->id != CTF_TYPE_VARIANT)) {
+               (type->declaration->id != BT_CTF_TYPE_ID_VARIANT)) {
                ret = -1;
                goto end;
        }
@@ -1671,7 +1672,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_from_tag(
        const char *enum_value;
        struct bt_ctf_field_type *field_type = NULL;
 
-       if (!type || !tag || type->declaration->id != CTF_TYPE_VARIANT) {
+       if (!type || !tag || type->declaration->id != BT_CTF_TYPE_ID_VARIANT) {
                goto end;
        }
 
@@ -1692,7 +1693,7 @@ int bt_ctf_field_type_variant_get_field_count(struct bt_ctf_field_type *type)
        int ret = 0;
        struct bt_ctf_field_type_variant *variant;
 
-       if (!type || (type->declaration->id != CTF_TYPE_VARIANT)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_VARIANT)) {
                ret = -1;
                goto end;
        }
@@ -1713,7 +1714,8 @@ int bt_ctf_field_type_variant_get_field(struct bt_ctf_field_type *type,
        struct structure_field *field;
        int ret = 0;
 
-       if (!type || index < 0 || (type->declaration->id != CTF_TYPE_VARIANT)) {
+       if (!type || index < 0 ||
+                       (type->declaration->id != BT_CTF_TYPE_ID_VARIANT)) {
                ret = -1;
                goto end;
        }
@@ -1753,7 +1755,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_create(
        }
 
        array->parent.declaration = &array->declaration.p;
-       array->parent.declaration->id = CTF_TYPE_ARRAY;
+       array->parent.declaration->id = BT_CTF_TYPE_ID_ARRAY;
 
        bt_get(element_type);
        array->element_type = element_type;
@@ -1770,7 +1772,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_get_element_type(
        struct bt_ctf_field_type *ret = NULL;
        struct bt_ctf_field_type_array *array;
 
-       if (!type || (type->declaration->id != CTF_TYPE_ARRAY)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_ARRAY)) {
                goto end;
        }
 
@@ -1789,7 +1791,7 @@ int bt_ctf_field_type_array_set_element_type(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_array *array;
 
        if (!type || !element_type ||
-                       (type->declaration->id != CTF_TYPE_ARRAY)) {
+                       (type->declaration->id != BT_CTF_TYPE_ID_ARRAY)) {
                ret = -1;
                goto end;
        }
@@ -1812,7 +1814,7 @@ int64_t bt_ctf_field_type_array_get_length(struct bt_ctf_field_type *type)
        int64_t ret;
        struct bt_ctf_field_type_array *array;
 
-       if (!type || (type->declaration->id != CTF_TYPE_ARRAY)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_ARRAY)) {
                ret = -1;
                goto end;
        }
@@ -1839,7 +1841,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_create(
        }
 
        sequence->parent.declaration = &sequence->declaration.p;
-       sequence->parent.declaration->id = CTF_TYPE_SEQUENCE;
+       sequence->parent.declaration->id = BT_CTF_TYPE_ID_SEQUENCE;
        bt_get(element_type);
        sequence->element_type = element_type;
        sequence->length_field_name = g_string_new(length_field_name);
@@ -1855,7 +1857,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_get_element_type(
        struct bt_ctf_field_type *ret = NULL;
        struct bt_ctf_field_type_sequence *sequence;
 
-       if (!type || (type->declaration->id != CTF_TYPE_SEQUENCE)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_SEQUENCE)) {
                goto end;
        }
 
@@ -1875,7 +1877,7 @@ int bt_ctf_field_type_sequence_set_element_type(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_sequence *sequence;
 
        if (!type || !element_type ||
-                       (type->declaration->id != CTF_TYPE_SEQUENCE)) {
+                       (type->declaration->id != BT_CTF_TYPE_ID_SEQUENCE)) {
                ret = -1;
                goto end;
        }
@@ -1899,7 +1901,7 @@ const char *bt_ctf_field_type_sequence_get_length_field_name(
        const char *ret = NULL;
        struct bt_ctf_field_type_sequence *sequence;
 
-       if (!type || (type->declaration->id != CTF_TYPE_SEQUENCE)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_SEQUENCE)) {
                goto end;
        }
 
@@ -1920,7 +1922,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_create(void)
        }
 
        string->parent.declaration = &string->declaration.p;
-       string->parent.declaration->id = CTF_TYPE_STRING;
+       string->parent.declaration->id = BT_CTF_TYPE_ID_STRING;
        bt_ctf_field_type_init(&string->parent, TRUE);
        string->declaration.encoding = BT_CTF_STRING_ENCODING_UTF8;
        string->parent.declaration->alignment = CHAR_BIT;
@@ -1933,7 +1935,7 @@ enum bt_ctf_string_encoding bt_ctf_field_type_string_get_encoding(
        struct bt_ctf_field_type_string *string;
        enum bt_ctf_string_encoding ret = BT_CTF_STRING_ENCODING_UNKNOWN;
 
-       if (!type || (type->declaration->id != CTF_TYPE_STRING)) {
+       if (!type || (type->declaration->id != BT_CTF_TYPE_ID_STRING)) {
                goto end;
        }
 
@@ -1950,7 +1952,7 @@ int bt_ctf_field_type_string_set_encoding(struct bt_ctf_field_type *type,
        int ret = 0;
        struct bt_ctf_field_type_string *string;
 
-       if (!type || type->declaration->id != CTF_TYPE_STRING ||
+       if (!type || type->declaration->id != BT_CTF_TYPE_ID_STRING ||
                (encoding != BT_CTF_STRING_ENCODING_UTF8 &&
                encoding != BT_CTF_STRING_ENCODING_ASCII)) {
                ret = -1;
@@ -1966,7 +1968,7 @@ end:
 int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type)
 {
        int ret;
-       enum ctf_type_id type_id;
+       enum bt_ctf_type_id type_id;
 
        if (!type) {
                ret = -1;
@@ -1980,7 +1982,7 @@ int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type)
 
        type_id = bt_ctf_field_type_get_type_id(type);
        switch (type_id) {
-       case CTF_TYPE_SEQUENCE:
+       case BT_CTF_TYPE_ID_SEQUENCE:
        {
                struct bt_ctf_field_type *element =
                        bt_ctf_field_type_sequence_get_element_type(type);
@@ -1994,7 +1996,7 @@ int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type)
                bt_put(element);
                break;
        }
-       case CTF_TYPE_ARRAY:
+       case BT_CTF_TYPE_ID_ARRAY:
        {
                struct bt_ctf_field_type *element =
                        bt_ctf_field_type_array_get_element_type(type);
@@ -2008,7 +2010,7 @@ int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type)
                bt_put(element);
                break;
        }
-       case CTF_TYPE_STRUCT:
+       case BT_CTF_TYPE_ID_STRUCT:
        {
                int i, element_count;
 
@@ -2044,7 +2046,7 @@ int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type)
                ret = (int) type->declaration->alignment;
                break;
        }
-       case CTF_TYPE_UNKNOWN:
+       case BT_CTF_TYPE_ID_UNKNOWN:
                ret = -1;
                break;
        default:
@@ -2065,7 +2067,7 @@ int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type,
                unsigned int alignment)
 {
        int ret = 0;
-       enum ctf_type_id type_id;
+       enum bt_ctf_type_id type_id;
 
        /* Alignment must be a power of two */
        if (!type || type->frozen || !is_power_of_two(alignment)) {
@@ -2074,19 +2076,20 @@ int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type,
        }
 
        type_id = bt_ctf_field_type_get_type_id(type);
-       if (type_id == CTF_TYPE_UNKNOWN) {
+       if (type_id == BT_CTF_TYPE_ID_UNKNOWN) {
                ret = -1;
                goto end;
        }
 
-       if (type->declaration->id == CTF_TYPE_STRING &&
+       if (type->declaration->id == BT_CTF_TYPE_ID_STRING &&
                alignment != CHAR_BIT) {
                ret = -1;
                goto end;
        }
 
-       if (type_id == CTF_TYPE_VARIANT || type_id == CTF_TYPE_SEQUENCE ||
-               type_id == CTF_TYPE_ARRAY) {
+       if (type_id == BT_CTF_TYPE_ID_VARIANT ||
+               type_id == BT_CTF_TYPE_ID_SEQUENCE ||
+               type_id == BT_CTF_TYPE_ID_ARRAY) {
                /* Setting an alignment on these types makes no sense */
                ret = -1;
                goto end;
@@ -2108,14 +2111,14 @@ enum bt_ctf_byte_order bt_ctf_field_type_get_byte_order(
        }
 
        switch (type->declaration->id) {
-       case CTF_TYPE_INTEGER:
+       case BT_CTF_TYPE_ID_INTEGER:
        {
                struct bt_ctf_field_type_integer *integer = container_of(
                        type, struct bt_ctf_field_type_integer, parent);
                ret = integer->user_byte_order;
                break;
        }
-       case CTF_TYPE_FLOAT:
+       case BT_CTF_TYPE_ID_FLOAT:
        {
                struct bt_ctf_field_type_floating_point *floating_point =
                        container_of(type,
@@ -2142,7 +2145,7 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
 {
        int ret = 0;
        int internal_byte_order;
-       enum ctf_type_id type_id;
+       enum bt_ctf_type_id type_id;
 
        if (!type || type->frozen) {
                ret = -1;
@@ -2174,11 +2177,11 @@ end:
        return ret;
 }
 
-enum ctf_type_id bt_ctf_field_type_get_type_id(
+enum bt_ctf_type_id bt_ctf_field_type_get_type_id(
                struct bt_ctf_field_type *type)
 {
        if (!type) {
-               return CTF_TYPE_UNKNOWN;
+               return BT_CTF_TYPE_ID_UNKNOWN;
        }
 
        return type->declaration->id;
@@ -2186,42 +2189,42 @@ enum ctf_type_id bt_ctf_field_type_get_type_id(
 
 int bt_ctf_field_type_is_integer(struct bt_ctf_field_type *type)
 {
-       return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_INTEGER;
+       return bt_ctf_field_type_get_type_id(type) == BT_CTF_TYPE_ID_INTEGER;
 }
 
 int bt_ctf_field_type_is_floating_point(struct bt_ctf_field_type *type)
 {
-       return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_FLOAT;
+       return bt_ctf_field_type_get_type_id(type) == BT_CTF_TYPE_ID_FLOAT;
 }
 
 int bt_ctf_field_type_is_enumeration(struct bt_ctf_field_type *type)
 {
-       return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_ENUM;
+       return bt_ctf_field_type_get_type_id(type) == BT_CTF_TYPE_ID_ENUM;
 }
 
 int bt_ctf_field_type_is_string(struct bt_ctf_field_type *type)
 {
-       return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_STRING;
+       return bt_ctf_field_type_get_type_id(type) == BT_CTF_TYPE_ID_STRING;
 }
 
 int bt_ctf_field_type_is_structure(struct bt_ctf_field_type *type)
 {
-       return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_STRUCT;
+       return bt_ctf_field_type_get_type_id(type) == BT_CTF_TYPE_ID_STRUCT;
 }
 
 int bt_ctf_field_type_is_array(struct bt_ctf_field_type *type)
 {
-       return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_ARRAY;
+       return bt_ctf_field_type_get_type_id(type) == BT_CTF_TYPE_ID_ARRAY;
 }
 
 int bt_ctf_field_type_is_sequence(struct bt_ctf_field_type *type)
 {
-       return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_SEQUENCE;
+       return bt_ctf_field_type_get_type_id(type) == BT_CTF_TYPE_ID_SEQUENCE;
 }
 
 int bt_ctf_field_type_is_variant(struct bt_ctf_field_type *type)
 {
-       return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_VARIANT;
+       return bt_ctf_field_type_get_type_id(type) == BT_CTF_TYPE_ID_VARIANT;
 }
 
 void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
@@ -2371,7 +2374,7 @@ int bt_ctf_field_type_structure_get_field_name_index(
        struct bt_ctf_field_type_structure *structure;
 
        if (!type || !name ||
-               bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) {
+               bt_ctf_field_type_get_type_id(type) != BT_CTF_TYPE_ID_STRUCT) {
                ret = -1;
                goto end;
        }
@@ -2402,7 +2405,7 @@ int bt_ctf_field_type_structure_set_field_index(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_structure *structure;
 
        if (!type || !field ||
-               bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) {
+               bt_ctf_field_type_get_type_id(type) != BT_CTF_TYPE_ID_STRUCT) {
                ret = -1;
                goto end;
        }
@@ -2433,7 +2436,7 @@ int bt_ctf_field_type_variant_get_field_name_index(
        struct bt_ctf_field_type_variant *variant;
 
        if (!type || !name ||
-               bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+               bt_ctf_field_type_get_type_id(type) != BT_CTF_TYPE_ID_VARIANT) {
                ret = -1;
                goto end;
        }
@@ -2464,7 +2467,8 @@ int bt_ctf_field_type_sequence_set_length_field_path(
        int ret = 0;
        struct bt_ctf_field_type_sequence *sequence;
 
-       if (!type || bt_ctf_field_type_get_type_id(type) != CTF_TYPE_SEQUENCE) {
+       if (!type || bt_ctf_field_type_get_type_id(type) !=
+                       BT_CTF_TYPE_ID_SEQUENCE) {
                ret = -1;
                goto end;
        }
@@ -2484,7 +2488,8 @@ int bt_ctf_field_type_variant_set_tag_field_path(struct bt_ctf_field_type *type,
        int ret = 0;
        struct bt_ctf_field_type_variant *variant;
 
-       if (!type || bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+       if (!type || bt_ctf_field_type_get_type_id(type) !=
+                       BT_CTF_TYPE_ID_VARIANT) {
                ret = -1;
                goto end;
        }
@@ -2505,7 +2510,8 @@ int bt_ctf_field_type_variant_set_tag_field_type(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_variant *variant;
 
        if (!type || !tag ||
-                       bt_ctf_field_type_get_type_id(tag) != CTF_TYPE_ENUM) {
+                       bt_ctf_field_type_get_type_id(tag) !=
+                       BT_CTF_TYPE_ID_ENUM) {
                ret = -1;
                goto end;
        }
@@ -2530,7 +2536,7 @@ int bt_ctf_field_type_variant_set_field_index(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_variant *variant;
 
        if (!type || !field ||
-               bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+               bt_ctf_field_type_get_type_id(type) != BT_CTF_TYPE_ID_VARIANT) {
                ret = -1;
                goto end;
        }
@@ -3968,7 +3974,7 @@ int bt_ctf_field_type_compare(struct bt_ctf_field_type *type_a,
                goto end;
        }
 
-       if (type_a->declaration->id == CTF_TYPE_UNKNOWN) {
+       if (type_a->declaration->id == BT_CTF_TYPE_ID_UNKNOWN) {
                /* Both have unknown type IDs */
                goto end;
        }