namespace the struct functions

[babeltrace.git] / types / variant.c

diff --git a/types/variant.c b/types/variant.c
index 4d00a3b3e1f5ebc3231d6c3ca26b876ec471050c..47c821ecd9fb6b1619499eb7a018004175b376a9 100644 (file)
--- a/types/variant.c
+++ b/types/variant.c
@@ -144,14 +144,14 @@ int check_enum_tag(struct definition_variant *variant,
         * variant choice map to an enumerator too. We then validate that the
         * number of enumerators equals the number of variant choices.
         */
-       if (variant->declaration->untagged_variant->fields->len != enum_get_nr_enumerators(enum_declaration))
+       if (variant->declaration->untagged_variant->fields->len != bt_enum_get_nr_enumerators(enum_declaration))
                return -EPERM;
 
        for (i = 0; i < variant->declaration->untagged_variant->fields->len; i++) {
                struct declaration_field *field_declaration =
                        &g_array_index(variant->declaration->untagged_variant->fields,
                                       struct declaration_field, i);
-               if (!enum_quark_to_range_set(enum_declaration, field_declaration->name)) {
+               if (!bt_enum_quark_to_range_set(enum_declaration, field_declaration->name)) {
                        missing_field = 1;
                        break;
                }
@@ -209,7 +209,7 @@ struct definition *
        if (!variant->enum_tag
            || check_enum_tag(variant, variant->enum_tag) < 0)
                goto error;
-       definition_ref(variant->enum_tag);
+       bt_definition_ref(variant->enum_tag);
        variant->fields = g_ptr_array_sized_new(variant_declaration->untagged_variant->fields->len);
        g_ptr_array_set_size(variant->fields, variant_declaration->untagged_variant->fields->len);
        for (i = 0; i < variant_declaration->untagged_variant->fields->len; i++) {
@@ -248,9 +248,9 @@ void _variant_definition_free(struct definition *definition)
        assert(variant->fields->len == variant->declaration->untagged_variant->fields->len);
        for (i = 0; i < variant->fields->len; i++) {
                struct definition *field = g_ptr_array_index(variant->fields, i);
-               definition_unref(field);
+               bt_definition_unref(field);
        }
-       definition_unref(variant->enum_tag);
+       bt_definition_unref(variant->enum_tag);
        free_definition_scope(variant->p.scope);
        bt_declaration_unref(variant->p.declaration);
        g_ptr_array_free(variant->fields, TRUE);