namespace the definition functions

[babeltrace.git] / types / struct.c

diff --git a/types/struct.c b/types/struct.c
index f065dbc7fe6f335b25ce2d67f18ba71a25e90bc5..5da9033e7a419ee1116bc7bfcf809d421791ff7e 100644 (file)
--- a/types/struct.c
+++ b/types/struct.c
@@ -67,7 +67,7 @@ void _struct_declaration_free(struct declaration *declaration)
                container_of(declaration, struct declaration_struct, p);
        unsigned long i;
 
-       free_declaration_scope(struct_declaration->scope);
+       bt_free_declaration_scope(struct_declaration->scope);
        g_hash_table_destroy(struct_declaration->fields_by_name);
 
        for (i = 0; i < struct_declaration->fields->len; i++) {
@@ -94,7 +94,7 @@ struct declaration_struct *
        struct_declaration->fields = g_array_sized_new(FALSE, TRUE,
                                                sizeof(struct declaration_field),
                                                DEFAULT_NR_STRUCT_FIELDS);
-       struct_declaration->scope = new_declaration_scope(parent_scope);
+       struct_declaration->scope = bt_new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_STRUCT;
        declaration->alignment = max(1, min_align);
        declaration->declaration_free = _struct_declaration_free;
@@ -128,10 +128,10 @@ struct definition *
         */
        _struct->p.index = root_name ? INT_MAX : index;
        _struct->p.name = field_name;
-       _struct->p.path = new_definition_path(parent_scope, field_name, root_name);
-       _struct->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+       _struct->p.path = bt_new_definition_path(parent_scope, field_name, root_name);
+       _struct->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name);
 
-       ret = register_field_definition(field_name, &_struct->p,
+       ret = bt_register_field_definition(field_name, &_struct->p,
                                        parent_scope);
        assert(!ret || ret == -EPERM);
 
@@ -157,7 +157,7 @@ error:
                struct definition *field = g_ptr_array_index(_struct->fields, i);
                bt_definition_unref(field);
        }
-       free_definition_scope(_struct->p.scope);
+       bt_free_definition_scope(_struct->p.scope);
        bt_declaration_unref(&struct_declaration->p);
        g_free(_struct);
        return NULL;
@@ -175,7 +175,7 @@ void _struct_definition_free(struct definition *definition)
                struct definition *field = g_ptr_array_index(_struct->fields, i);
                bt_definition_unref(field);
        }
-       free_definition_scope(_struct->p.scope);
+       bt_free_definition_scope(_struct->p.scope);
        bt_declaration_unref(_struct->p.declaration);
        g_ptr_array_free(_struct->fields, TRUE);
        g_free(_struct);