X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=2646cef493b426be12f76c16a96d9c1c05be9b30;hp=1795ae4ee401bfd451b582157c9bc53bd498e74d;hb=2b77e6a6ff6a0b46ee3bd607d1d75f2d20af5ea0;hpb=ebae302b9108c5747e8af8b3d54740f48479b245 diff --git a/types/sequence.c b/types/sequence.c index 1795ae4e..2646cef4 100644 --- a/types/sequence.c +++ b/types/sequence.c @@ -148,12 +148,12 @@ struct definition *_sequence_definition_new(struct declaration *declaration, */ sequence->p.index = root_name ? INT_MAX : index; sequence->p.name = field_name; - sequence->p.path = new_definition_path(parent_scope, field_name, root_name); - sequence->p.scope = new_definition_scope(parent_scope, field_name, root_name); - ret = register_field_definition(field_name, &sequence->p, + sequence->p.path = bt_new_definition_path(parent_scope, field_name, root_name); + sequence->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name); + ret = bt_register_field_definition(field_name, &sequence->p, parent_scope); assert(!ret); - len_parent = lookup_path_definition(sequence->p.scope->scope_path, + len_parent = bt_lookup_path_definition(sequence->p.scope->scope_path, sequence_declaration->length_name, parent_scope); if (!len_parent) { @@ -191,7 +191,7 @@ struct definition *_sequence_definition_new(struct declaration *declaration, return &sequence->p; error: - free_definition_scope(sequence->p.scope); + bt_free_definition_scope(sequence->p.scope); bt_declaration_unref(&sequence_declaration->p); g_free(sequence); return NULL; @@ -217,7 +217,7 @@ void _sequence_definition_free(struct definition *definition) (void) g_ptr_array_free(sequence->elems, TRUE); } bt_definition_unref(len_definition); - free_definition_scope(sequence->p.scope); + bt_free_definition_scope(sequence->p.scope); bt_declaration_unref(sequence->p.declaration); g_free(sequence); }