namespace the string functions

[babeltrace.git] / types / struct.c

diff --git a/types/struct.c b/types/struct.c
index 138da167509ae25c8cf0f218b4ca5ccfeaf63978..cf8fef6bd6812306d69985dc43efe26194c7deeb 100644 (file)
--- a/types/struct.c
+++ b/types/struct.c
@@ -74,7 +74,7 @@ void _struct_declaration_free(struct declaration *declaration)
                struct declaration_field *declaration_field =
                        &g_array_index(struct_declaration->fields,
                                       struct declaration_field, i);
-               declaration_unref(declaration_field->declaration);
+               bt_declaration_unref(declaration_field->declaration);
        }
        g_array_free(struct_declaration->fields, true);
        g_free(struct_declaration);
@@ -118,7 +118,7 @@ struct definition *
        int ret;
 
        _struct = g_new(struct definition_struct, 1);
-       declaration_ref(&struct_declaration->p);
+       bt_declaration_ref(&struct_declaration->p);
        _struct->p.declaration = declaration;
        _struct->declaration = struct_declaration;
        _struct->p.ref = 1;
@@ -155,10 +155,10 @@ struct definition *
 error:
        for (i--; i >= 0; i--) {
                struct definition *field = g_ptr_array_index(_struct->fields, i);
-               definition_unref(field);
+               bt_definition_unref(field);
        }
        free_definition_scope(_struct->p.scope);
-       declaration_unref(&struct_declaration->p);
+       bt_declaration_unref(&struct_declaration->p);
        g_free(_struct);
        return NULL;
 }
@@ -173,10 +173,10 @@ void _struct_definition_free(struct definition *definition)
        assert(_struct->fields->len == _struct->declaration->fields->len);
        for (i = 0; i < _struct->fields->len; i++) {
                struct definition *field = g_ptr_array_index(_struct->fields, i);
-               definition_unref(field);
+               bt_definition_unref(field);
        }
        free_definition_scope(_struct->p.scope);
-       declaration_unref(_struct->p.declaration);
+       bt_declaration_unref(_struct->p.declaration);
        g_ptr_array_free(_struct->fields, TRUE);
        g_free(_struct);
 }
@@ -192,7 +192,7 @@ void struct_declaration_add_field(struct declaration_struct *struct_declaration,
        index = struct_declaration->fields->len - 1;    /* last field (new) */
        field = &g_array_index(struct_declaration->fields, struct declaration_field, index);
        field->name = g_quark_from_string(field_name);
-       declaration_ref(field_declaration);
+       bt_declaration_ref(field_declaration);
        field->declaration = field_declaration;
        /* Keep index in hash rather than pointer, because array can relocate */
        g_hash_table_insert(struct_declaration->fields_by_name,