X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=736e866439bfbcf90b17df5be9a6ffe000da2eec;hp=0e84b1d18ceb092fe28af8c45ce1eb8a9fcba23c;hb=13fad8b6d8ad53a55baca25234a0c59aeff83a3b;hpb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0 diff --git a/types/sequence.c b/types/sequence.c index 0e84b1d1..736e8664 100644 --- a/types/sequence.c +++ b/types/sequence.c @@ -95,7 +95,7 @@ void _sequence_declaration_free(struct declaration *declaration) free_declaration_scope(sequence_declaration->scope); g_array_free(sequence_declaration->length_name, TRUE); - declaration_unref(sequence_declaration->elem); + bt_declaration_unref(sequence_declaration->elem); g_free(sequence_declaration); } @@ -111,9 +111,9 @@ struct declaration_sequence * declaration = &sequence_declaration->p; sequence_declaration->length_name = g_array_new(FALSE, TRUE, sizeof(GQuark)); - append_scope_path(length, sequence_declaration->length_name); + bt_append_scope_path(length, sequence_declaration->length_name); - declaration_ref(elem_declaration); + bt_declaration_ref(elem_declaration); sequence_declaration->elem = elem_declaration; sequence_declaration->scope = new_declaration_scope(parent_scope); declaration->id = CTF_TYPE_SEQUENCE; @@ -138,7 +138,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration, int ret; sequence = g_new(struct definition_sequence, 1); - declaration_ref(&sequence_declaration->p); + bt_declaration_ref(&sequence_declaration->p); sequence->p.declaration = declaration; sequence->declaration = sequence_declaration; sequence->p.ref = 1; @@ -166,7 +166,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration, printf("[error] Sequence length field should be unsigned.\n"); goto error; } - definition_ref(len_parent); + bt_definition_ref(len_parent); sequence->string = NULL; sequence->elems = NULL; @@ -192,7 +192,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration, error: free_definition_scope(sequence->p.scope); - declaration_unref(&sequence_declaration->p); + bt_declaration_unref(&sequence_declaration->p); g_free(sequence); return NULL; } @@ -216,9 +216,9 @@ void _sequence_definition_free(struct definition *definition) } (void) g_ptr_array_free(sequence->elems, TRUE); } - definition_unref(len_definition); + bt_definition_unref(len_definition); free_definition_scope(sequence->p.scope); - declaration_unref(sequence->p.declaration); + bt_declaration_unref(sequence->p.declaration); g_free(sequence); }