X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=1795ae4ee401bfd451b582157c9bc53bd498e74d;hp=18d7e350abbb3b69273fddd937e1a3a30b63d17d;hb=becd02a104b8c1634ce914d1d2cd36be932b9b16;hpb=e6b4b4f489f66decb680245a13e9e53abfe62ede diff --git a/types/sequence.c b/types/sequence.c index 18d7e350..1795ae4e 100644 --- a/types/sequence.c +++ b/types/sequence.c @@ -39,7 +39,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration, static void _sequence_definition_free(struct definition *definition); -int sequence_rw(struct stream_pos *pos, struct definition *definition) +int bt_sequence_rw(struct stream_pos *pos, struct definition *definition) { struct definition_sequence *sequence_definition = container_of(definition, struct definition_sequence, p); @@ -93,14 +93,14 @@ 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); } struct declaration_sequence * - sequence_declaration_new(const char *length, + bt_sequence_declaration_new(const char *length, struct declaration *elem_declaration, struct declaration_scope *parent_scope) { @@ -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; @@ -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; @@ -216,18 +216,18 @@ 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); bt_declaration_unref(sequence->p.declaration); g_free(sequence); } -uint64_t sequence_len(struct definition_sequence *sequence) +uint64_t bt_sequence_len(struct definition_sequence *sequence) { return sequence->length->value._unsigned; } -struct definition *sequence_index(struct definition_sequence *sequence, uint64_t i) +struct definition *bt_sequence_index(struct definition_sequence *sequence, uint64_t i) { if (!sequence->elems) return NULL;