namespace the lookup_integer function

[babeltrace.git] / types / sequence.c

diff --git a/types/sequence.c b/types/sequence.c
index 6ed168c7f96ce57692968d59fa5da8fa14b475c8..2646cef493b426be12f76c16a96d9c1c05be9b30 100644 (file)
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -93,7 +93,7 @@ void _sequence_declaration_free(struct declaration *declaration)
        struct declaration_sequence *sequence_declaration =
                container_of(declaration, struct declaration_sequence, p);
 
-       free_declaration_scope(sequence_declaration->scope);
+       bt_free_declaration_scope(sequence_declaration->scope);
        g_array_free(sequence_declaration->length_name, TRUE);
        bt_declaration_unref(sequence_declaration->elem);
        g_free(sequence_declaration);
@@ -115,7 +115,7 @@ struct declaration_sequence *
 
        bt_declaration_ref(elem_declaration);
        sequence_declaration->elem = elem_declaration;
-       sequence_declaration->scope = new_declaration_scope(parent_scope);
+       sequence_declaration->scope = bt_new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_SEQUENCE;
        declaration->alignment = elem_declaration->alignment;
        declaration->declaration_free = _sequence_declaration_free;
@@ -148,12 +148,12 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
         */
        sequence->p.index = root_name ? INT_MAX : index;
        sequence->p.name = field_name;
-       sequence->p.path = new_definition_path(parent_scope, field_name, root_name);
-       sequence->p.scope = new_definition_scope(parent_scope, field_name, root_name);
-       ret = register_field_definition(field_name, &sequence->p,
+       sequence->p.path = bt_new_definition_path(parent_scope, field_name, root_name);
+       sequence->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name);
+       ret = bt_register_field_definition(field_name, &sequence->p,
                                        parent_scope);
        assert(!ret);
-       len_parent = lookup_path_definition(sequence->p.scope->scope_path,
+       len_parent = bt_lookup_path_definition(sequence->p.scope->scope_path,
                                            sequence_declaration->length_name,
                                            parent_scope);
        if (!len_parent) {
@@ -191,7 +191,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
        return &sequence->p;
 
 error:
-       free_definition_scope(sequence->p.scope);
+       bt_free_definition_scope(sequence->p.scope);
        bt_declaration_unref(&sequence_declaration->p);
        g_free(sequence);
        return NULL;
@@ -217,7 +217,7 @@ void _sequence_definition_free(struct definition *definition)
                (void) g_ptr_array_free(sequence->elems, TRUE);
        }
        bt_definition_unref(len_definition);
-       free_definition_scope(sequence->p.scope);
+       bt_free_definition_scope(sequence->p.scope);
        bt_declaration_unref(sequence->p.declaration);
        g_free(sequence);
 }