X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Farray.c;fp=types%2Farray.c;h=30699b1f1ef87c545b2883432cabc9bf39c80025;hp=7f821677a32925b63feb2b899b4c967f8222138c;hb=2b77e6a6ff6a0b46ee3bd607d1d75f2d20af5ea0;hpb=ebae302b9108c5747e8af8b3d54740f48479b245 diff --git a/types/array.c b/types/array.c index 7f821677..30699b1f 100644 --- a/types/array.c +++ b/types/array.c @@ -115,9 +115,9 @@ struct definition * */ array->p.index = root_name ? INT_MAX : index; array->p.name = field_name; - array->p.path = new_definition_path(parent_scope, field_name, root_name); - array->p.scope = new_definition_scope(parent_scope, field_name, root_name); - ret = register_field_definition(field_name, &array->p, + array->p.path = bt_new_definition_path(parent_scope, field_name, root_name); + array->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name); + ret = bt_register_field_definition(field_name, &array->p, parent_scope); assert(!ret); array->string = NULL; @@ -169,7 +169,7 @@ error: field->declaration->definition_free(field); } (void) g_ptr_array_free(array->elems, TRUE); - free_definition_scope(array->p.scope); + bt_free_definition_scope(array->p.scope); bt_declaration_unref(array->p.declaration); g_free(array); return NULL; @@ -193,7 +193,7 @@ void _array_definition_free(struct definition *definition) } (void) g_ptr_array_free(array->elems, TRUE); } - free_definition_scope(array->p.scope); + bt_free_definition_scope(array->p.scope); bt_declaration_unref(array->p.declaration); g_free(array); }