X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=types%2Fstruct.c;h=5cc0849f55cdc344690161f1d130120996b37485;hb=e6b4b4f489f66decb680245a13e9e53abfe62ede;hp=a9703b28e4859a00f59f59894c2a0a37762c0305;hpb=98df1c9fb24d5e7e10bf628692011e130e0d8339;p=babeltrace.git

diff --git a/types/struct.c b/types/struct.c
index a9703b28..5cc0849f 100644
--- a/types/struct.c
+++ b/types/struct.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Structure Type Converter
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * 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 <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <errno.h>
 
 #ifndef max
@@ -63,7 +74,7 @@ void _struct_declaration_free(struct declaration *declaration)
 		struct declaration_field *declaration_field =
 			&g_array_index(struct_declaration->fields,
 				       struct declaration_field, i);
-		declaration_unref(declaration_field->declaration);
+		bt_declaration_unref(declaration_field->declaration);
 	}
 	g_array_free(struct_declaration->fields, true);
 	g_free(struct_declaration);
@@ -107,7 +118,7 @@ struct definition *
 	int ret;
 
 	_struct = g_new(struct definition_struct, 1);
-	declaration_ref(&struct_declaration->p);
+	bt_declaration_ref(&struct_declaration->p);
 	_struct->p.declaration = declaration;
 	_struct->declaration = struct_declaration;
 	_struct->p.ref = 1;
@@ -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,8 +157,8 @@ error:
 		struct definition *field = g_ptr_array_index(_struct->fields, i);
 		definition_unref(field);
 	}
-	free_definition_scope(_struct->scope);
-	declaration_unref(&struct_declaration->p);
+	free_definition_scope(_struct->p.scope);
+	bt_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);
-	declaration_unref(_struct->p.declaration);
+	free_definition_scope(_struct->p.scope);
+	bt_declaration_unref(_struct->p.declaration);
+	g_ptr_array_free(_struct->fields, TRUE);
 	g_free(_struct);
 }
 
@@ -180,7 +192,7 @@ void struct_declaration_add_field(struct declaration_struct *struct_declaration,
 	index = struct_declaration->fields->len - 1;	/* last field (new) */
 	field = &g_array_index(struct_declaration->fields, struct declaration_field, index);
 	field->name = g_quark_from_string(field_name);
-	declaration_ref(field_declaration);
+	bt_declaration_ref(field_declaration);
 	field->declaration = field_declaration;
 	/* Keep index in hash rather than pointer, because array can relocate */
 	g_hash_table_insert(struct_declaration->fields_by_name,