X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=138da167509ae25c8cf0f218b4ca5ccfeaf63978;hp=a9703b28e4859a00f59f59894c2a0a37762c0305;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=98df1c9fb24d5e7e10bf628692011e130e0d8339 diff --git a/types/struct.c b/types/struct.c index a9703b28..138da167 100644 --- a/types/struct.c +++ b/types/struct.c @@ -3,7 +3,9 @@ * * BabelTrace - Structure Type Converter * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -14,10 +16,19 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include +#include #include #ifndef max @@ -118,7 +129,7 @@ struct definition * _struct->p.index = root_name ? INT_MAX : index; _struct->p.name = field_name; _struct->p.path = new_definition_path(parent_scope, field_name, root_name); - _struct->scope = new_definition_scope(parent_scope, field_name, root_name); + _struct->p.scope = new_definition_scope(parent_scope, field_name, root_name); ret = register_field_definition(field_name, &_struct->p, parent_scope); @@ -134,7 +145,7 @@ struct definition * (struct definition **) &g_ptr_array_index(_struct->fields, i); *field = declaration_field->declaration->definition_new(declaration_field->declaration, - _struct->scope, + _struct->p.scope, declaration_field->name, i, NULL); if (!*field) goto error; @@ -146,7 +157,7 @@ error: struct definition *field = g_ptr_array_index(_struct->fields, i); definition_unref(field); } - free_definition_scope(_struct->scope); + free_definition_scope(_struct->p.scope); declaration_unref(&struct_declaration->p); g_free(_struct); return NULL; @@ -164,8 +175,9 @@ void _struct_definition_free(struct definition *definition) struct definition *field = g_ptr_array_index(_struct->fields, i); definition_unref(field); } - free_definition_scope(_struct->scope); + free_definition_scope(_struct->p.scope); declaration_unref(_struct->p.declaration); + g_ptr_array_free(_struct->fields, TRUE); g_free(_struct); }