X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Farray.c;h=db6853f5ebcbf902a60cdcb9a86782c6bb225f5e;hp=6c17299a532718cc52841b62497f2616456720f9;hb=70bd0a12b09ce7f233189cf07e090fda593ebc48;hpb=81dee1bb528a95f7bf2bc622948807150794a75e

diff --git a/types/array.c b/types/array.c
index 6c17299a..db6853f5 100644
--- a/types/array.c
+++ b/types/array.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Array 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
@@ -106,7 +108,7 @@ 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->scope = new_definition_scope(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,
 					parent_scope);
 	assert(!ret);
@@ -143,7 +145,7 @@ struct definition *
 
 		field = (struct definition **) &g_ptr_array_index(array->elems, i);
 		*field = array_declaration->elem->definition_new(array_declaration->elem,
-					  array->scope,
+					  array->p.scope,
 					  name, i, NULL);
 		if (!*field)
 			goto error;
@@ -159,7 +161,7 @@ error:
 		field->declaration->definition_free(field);
 	}
 	(void) g_ptr_array_free(array->elems, TRUE);
-	free_definition_scope(array->scope);
+	free_definition_scope(array->p.scope);
 	declaration_unref(array->p.declaration);
 	g_free(array);
 	return NULL;
@@ -183,7 +185,7 @@ void _array_definition_free(struct definition *definition)
 		}
 		(void) g_ptr_array_free(array->elems, TRUE);
 	}
-	free_definition_scope(array->scope);
+	free_definition_scope(array->p.scope);
 	declaration_unref(array->p.declaration);
 	g_free(array);
 }