namespace the int functions

[babeltrace.git] / types / array.c

diff --git a/types/array.c b/types/array.c
index 3a92ef769fff5684680b616c0391678226709ecc..cc9a60085cbf167f155a47003b1ffce84838b2c5 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 array_rw(struct stream_pos *pos, struct definition *definition)
+int bt_array_rw(struct stream_pos *pos, struct definition *definition)
 {
        struct definition_array *array_definition =
                container_of(definition, struct definition_array, p);
@@ -65,12 +65,12 @@ void _array_declaration_free(struct declaration *declaration)
                container_of(declaration, struct declaration_array, p);
 
        free_declaration_scope(array_declaration->scope);
-       declaration_unref(array_declaration->elem);
+       bt_declaration_unref(array_declaration->elem);
        g_free(array_declaration);
 }
 
 struct declaration_array *
-       array_declaration_new(size_t len,
+       bt_array_declaration_new(size_t len,
                              struct declaration *elem_declaration,
                              struct declaration_scope *parent_scope)
 {
@@ -80,12 +80,11 @@ struct declaration_array *
        array_declaration = g_new(struct declaration_array, 1);
        declaration = &array_declaration->p;
        array_declaration->len = len;
-       declaration_ref(elem_declaration);
+       bt_declaration_ref(elem_declaration);
        array_declaration->elem = elem_declaration;
        array_declaration->scope = new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_ARRAY;
-       /* No need to align the array, the first element will align itself */
-       declaration->alignment = 1;
+       declaration->alignment = elem_declaration->alignment;
        declaration->declaration_free = _array_declaration_free;
        declaration->definition_new = _array_definition_new;
        declaration->definition_free = _array_definition_free;
@@ -106,7 +105,7 @@ struct definition *
        int i;
 
        array = g_new(struct definition_array, 1);
-       declaration_ref(&array_declaration->p);
+       bt_declaration_ref(&array_declaration->p);
        array->p.declaration = declaration;
        array->declaration = array_declaration;
        array->p.ref = 1;
@@ -171,7 +170,7 @@ error:
        }
        (void) g_ptr_array_free(array->elems, TRUE);
        free_definition_scope(array->p.scope);
-       declaration_unref(array->p.declaration);
+       bt_declaration_unref(array->p.declaration);
        g_free(array);
        return NULL;
 }
@@ -195,18 +194,18 @@ void _array_definition_free(struct definition *definition)
                (void) g_ptr_array_free(array->elems, TRUE);
        }
        free_definition_scope(array->p.scope);
-       declaration_unref(array->p.declaration);
+       bt_declaration_unref(array->p.declaration);
        g_free(array);
 }
 
-uint64_t array_len(struct definition_array *array)
+uint64_t bt_array_len(struct definition_array *array)
 {
        if (!array->elems)
                return array->string->len;
        return array->elems->len;
 }
 
-struct definition *array_index(struct definition_array *array, uint64_t i)
+struct definition *bt_array_index(struct definition_array *array, uint64_t i)
 {
        if (!array->elems)
                return NULL;
@@ -215,7 +214,7 @@ struct definition *array_index(struct definition_array *array, uint64_t i)
        return g_ptr_array_index(array->elems, i);
 }
 
-int get_array_len(const struct definition *field)
+int bt_get_array_len(const struct definition *field)
 {
        struct definition_array *array_definition;
        struct declaration_array *array_declaration;
@@ -226,7 +225,7 @@ int get_array_len(const struct definition *field)
        return array_declaration->len;
 }
 
-GString *get_char_array(const struct definition *field)
+GString *bt_get_char_array(const struct definition *field)
 {
        struct definition_array *array_definition;
        struct declaration_array *array_declaration;