X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=types%2Fenum.c;h=3f7d46bd423127578fffa4e077a448c67eac01a7;hb=b9e662acc05d66a1eddda359712281fde8e6b120;hp=67c23f0905983ad6bb5831b139d2eed9fc7e5a53;hpb=f66259163f060ada8d0fee348857c968e338ea40;p=babeltrace.git

diff --git a/types/enum.c b/types/enum.c
index 67c23f09..3f7d46bd 100644
--- a/types/enum.c
+++ b/types/enum.c
@@ -23,7 +23,8 @@
 
 static
 struct definition *_enum_definition_new(struct declaration *declaration,
-					struct definition_scope *parent_scope);
+					struct definition_scope *parent_scope,
+					GQuark field_name, int index);
 static
 void _enum_definition_free(struct definition *definition);
 
@@ -391,7 +392,7 @@ void _enum_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_enum *
-	_enum_declaration_new(const char *name, struct declaration_integer *integer_declaration)
+	_enum_declaration_new(struct declaration_integer *integer_declaration)
 {
 	struct declaration_enum *enum_declaration;
 
@@ -408,7 +409,6 @@ struct declaration_enum *
 	declaration_ref(&integer_declaration->p);
 	enum_declaration->integer_declaration = integer_declaration;
 	enum_declaration->p.id = CTF_TYPE_ENUM;
-	enum_declaration->p.name = g_quark_from_string(name);
 	enum_declaration->p.alignment = 1;
 	enum_declaration->p.copy = enum_copy;
 	enum_declaration->p.declaration_free = _enum_declaration_free;
@@ -421,7 +421,8 @@ struct declaration_enum *
 static
 struct definition *
 	_enum_definition_new(struct declaration *declaration,
-			     struct definition_scope *parent_scope)
+			     struct definition_scope *parent_scope,
+			     GQuark field_name, int index)
 {
 	struct declaration_enum *enum_declaration =
 		container_of(declaration, struct declaration_enum, p);
@@ -433,10 +434,11 @@ struct definition *
 	_enum->p.declaration = declaration;
 	_enum->declaration = enum_declaration;
 	_enum->p.ref = 1;
+	_enum->p.index = index;
 	_enum->value = NULL;
 	definition_integer_parent =
 		enum_declaration->integer_declaration->p.definition_new(&enum_declaration->integer_declaration->p,
-							   parent_scope);
+					parent_scope, field_name, 0);
 	_enum->integer = container_of(definition_integer_parent,
 				      struct definition_integer, p);
 	return &_enum->p;