X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=69e3a553a2d64202344d8ca411af21daa07f7d8d;hp=03c92ea4093bff548ea398cf955a7f687fe3a862;hb=427c09b7f5d932748ee0eee050388c9873bcb6c3;hpb=f66259163f060ada8d0fee348857c968e338ea40

diff --git a/types/struct.c b/types/struct.c
index 03c92ea4..69e3a553 100644
--- a/types/struct.c
+++ b/types/struct.c
@@ -25,7 +25,8 @@
 
 static
 struct definition *_struct_definition_new(struct declaration *declaration,
-				struct definition_scope *parent_scope);
+				struct definition_scope *parent_scope,
+				GQuark field_name, int index);
 static
 void _struct_definition_free(struct definition *definition);
 
@@ -73,8 +74,8 @@ void _struct_declaration_free(struct declaration *declaration)
 	g_free(struct_declaration);
 }
 
-struct declaration_struct *struct_declaration_new(const char *name,
-				    struct declaration_scope *parent_scope)
+struct declaration_struct *
+	struct_declaration_new(struct declaration_scope *parent_scope)
 {
 	struct declaration_struct *struct_declaration;
 	struct declaration *declaration;
@@ -88,7 +89,6 @@ struct declaration_struct *struct_declaration_new(const char *name,
 						DEFAULT_NR_STRUCT_FIELDS);
 	struct_declaration->scope = new_declaration_scope(parent_scope);
 	declaration->id = CTF_TYPE_STRUCT;
-	declaration->name = g_quark_from_string(name);
 	declaration->alignment = 1;
 	declaration->copy = struct_copy;
 	declaration->declaration_free = _struct_declaration_free;
@@ -101,7 +101,8 @@ struct declaration_struct *struct_declaration_new(const char *name,
 static
 struct definition *
 	_struct_definition_new(struct declaration *declaration,
-			       struct definition_scope *parent_scope)
+			       struct definition_scope *parent_scope,
+			       GQuark field_name, int index)
 {
 	struct declaration_struct *struct_declaration =
 		container_of(declaration, struct declaration_struct, p);
@@ -114,7 +115,8 @@ struct definition *
 	_struct->p.declaration = declaration;
 	_struct->declaration = struct_declaration;
 	_struct->p.ref = 1;
-	_struct->scope = new_definition_scope(parent_scope);
+	_struct->p.index = index;
+	_struct->scope = new_definition_scope(parent_scope, field_name);
 	_struct->fields = g_array_sized_new(FALSE, TRUE,
 					    sizeof(struct field),
 					    DEFAULT_NR_STRUCT_FIELDS);
@@ -129,7 +131,8 @@ struct definition *
 		field->name = declaration_field->name;
 		field->definition =
 			declaration_field->declaration->definition_new(declaration_field->declaration,
-							  _struct->scope);
+							  _struct->scope,
+							  field->name, i);
 		ret = register_field_definition(field->name,
 						field->definition,
 						_struct->scope);