X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fenum.c;h=82a02dfe26e189096c4bf36343ea0357070b942c;hp=36e310b0d80ede1ef07b410d21231dccc161ef34;hb=b1a2f5806630289aa0b85edbb7f7c581cfa26178;hpb=05c749e538ebc3a4f6735f62d022655cf92fc17e

diff --git a/types/enum.c b/types/enum.c
index 36e310b0..82a02dfe 100644
--- a/types/enum.c
+++ b/types/enum.c
@@ -349,31 +349,6 @@ size_t enum_get_nr_enumerators(struct declaration_enum *enum_declaration)
 	return g_hash_table_size(enum_declaration->table.quark_to_range_set);
 }
 
-void enum_copy(struct stream_pos *dest, const struct format *fdest, 
-	       struct stream_pos *src, const struct format *fsrc,
-	       struct definition *definition)
-{
-	struct definition_enum *_enum =
-		container_of(definition, struct definition_enum, p);
-	struct declaration_enum *enum_declaration= _enum->declaration;
-	GArray *array;
-	GQuark v;
-
-	array = fsrc->enum_read(src, enum_declaration);
-	assert(array);
-	/* unref previous array */
-	if (_enum->value)
-		g_array_unref(_enum->value);
-	_enum->value = array;
-	/*
-	 * Arbitrarily choose the first one.
-	 * TODO: use direct underlying declaration read/write intead. Not doing it for
-	 * now to test enum read and write code.
-	 */
-	v = g_array_index(array, GQuark, 0);
-	return fdest->enum_write(dest, enum_declaration, v);
-}
-
 static
 void _enum_declaration_free(struct declaration *declaration)
 {
@@ -392,7 +367,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;
 
@@ -403,15 +378,13 @@ struct declaration_enum *
 							    enum_val_free,
 							    enum_range_set_free);
 	CDS_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark);
-	enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_int_hash,
-							g_int_equal,
+	enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_direct_hash,
+							g_direct_equal,
 							NULL, enum_range_set_free);
 	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;
 	enum_declaration->p.definition_new = _enum_definition_new;
 	enum_declaration->p.definition_free = _enum_definition_free;
@@ -436,10 +409,12 @@ struct definition *
 	_enum->declaration = enum_declaration;
 	_enum->p.ref = 1;
 	_enum->p.index = index;
+	_enum->p.name = field_name;
 	_enum->value = NULL;
 	definition_integer_parent =
 		enum_declaration->integer_declaration->p.definition_new(&enum_declaration->integer_declaration->p,
-					parent_scope, field_name, 0);
+				parent_scope,
+				g_quark_from_static_string("container"), 0);
 	_enum->integer = container_of(definition_integer_parent,
 				      struct definition_integer, p);
 	return &_enum->p;