Namespace struct stream_pos

[babeltrace.git] / types / array.c

diff --git a/types/array.c b/types/array.c
index cc9a60085cbf167f155a47003b1ffce84838b2c5..43decb50574bb190f3521d0a7f698427a453730d 100644 (file)
--- a/types/array.c
+++ b/types/array.c
@@ -38,7 +38,7 @@ struct definition *_array_definition_new(struct declaration *declaration,
 static
 void _array_definition_free(struct definition *definition);
 
-int bt_array_rw(struct stream_pos *pos, struct definition *definition)
+int bt_array_rw(struct bt_stream_pos *pos, struct definition *definition)
 {
        struct definition_array *array_definition =
                container_of(definition, struct definition_array, p);
@@ -64,7 +64,7 @@ void _array_declaration_free(struct declaration *declaration)
        struct declaration_array *array_declaration =
                container_of(declaration, struct declaration_array, p);
 
-       free_declaration_scope(array_declaration->scope);
+       bt_free_declaration_scope(array_declaration->scope);
        bt_declaration_unref(array_declaration->elem);
        g_free(array_declaration);
 }
@@ -82,7 +82,7 @@ struct declaration_array *
        array_declaration->len = len;
        bt_declaration_ref(elem_declaration);
        array_declaration->elem = elem_declaration;
-       array_declaration->scope = new_declaration_scope(parent_scope);
+       array_declaration->scope = bt_new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_ARRAY;
        declaration->alignment = elem_declaration->alignment;
        declaration->declaration_free = _array_declaration_free;
@@ -115,9 +115,9 @@ struct definition *
         */
        array->p.index = root_name ? INT_MAX : index;
        array->p.name = field_name;
-       array->p.path = new_definition_path(parent_scope, field_name, root_name);
-       array->p.scope = new_definition_scope(parent_scope, field_name, root_name);
-       ret = register_field_definition(field_name, &array->p,
+       array->p.path = bt_new_definition_path(parent_scope, field_name, root_name);
+       array->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name);
+       ret = bt_register_field_definition(field_name, &array->p,
                                        parent_scope);
        assert(!ret);
        array->string = NULL;
@@ -169,7 +169,7 @@ error:
                field->declaration->definition_free(field);
        }
        (void) g_ptr_array_free(array->elems, TRUE);
-       free_definition_scope(array->p.scope);
+       bt_free_definition_scope(array->p.scope);
        bt_declaration_unref(array->p.declaration);
        g_free(array);
        return NULL;
@@ -193,7 +193,7 @@ void _array_definition_free(struct definition *definition)
                }
                (void) g_ptr_array_free(array->elems, TRUE);
        }
-       free_definition_scope(array->p.scope);
+       bt_free_definition_scope(array->p.scope);
        bt_declaration_unref(array->p.declaration);
        g_free(array);
 }