X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fenum.c;h=f8fc9e57f1b0f423e0e24c7dd21f2db170c80b11;hp=d0b284e67598c1474e09529689f19fb88677cc6f;hb=c5e74408f9786219f6b44400dcf2098ab9cc78fb;hpb=e19c3d69b39d2fa422ab54b5ec7192799f536680

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index d0b284e6..f8fc9e57 100644
--- a/formats/ctf/types/enum.c
+++ b/formats/ctf/types/enum.c
@@ -20,45 +20,42 @@
 #include <stdint.h>
 #include <glib.h>
 
-/*
- * The caller should unref the GArray.
- */
-GArray *ctf_enum_read(struct stream_pos *pos,
-		      const struct type_enum *src)
+int ctf_enum_read(struct stream_pos *ppos, struct definition *definition)
 {
-	const struct type_integer *integer_type = src->integer_type;
-
-	if (!integer_type->signedness) {
-		uint64_t v;
-
-		v = ctf_uint_read(pos, integer_type);
-		return enum_uint_to_quark_set(src, v);
-	} else {
-		int64_t v;
-
-		v = ctf_int_read(pos, integer_type);
-		return enum_int_to_quark_set(src, v);
-	}
+	struct definition_enum *enum_definition =
+		container_of(definition, struct definition_enum, p);
+	const struct declaration_enum *enum_declaration =
+		enum_definition->declaration;
+	struct definition_integer *integer_definition =
+		enum_definition->integer;
+	const struct declaration_integer *integer_declaration =
+		integer_definition->declaration;
+	GArray *qs;
+	int ret;
+
+	ret = ctf_integer_read(ppos, &integer_definition->p);
+	if (ret)
+		return ret;
+	if (!integer_declaration->signedness)
+		qs = enum_uint_to_quark_set(enum_declaration,
+			integer_definition->value._unsigned);
+	else
+		qs = enum_int_to_quark_set(enum_declaration,
+			integer_definition->value._signed);
+	assert(qs);
+	/* unref previous quark set */
+	if (enum_definition->value)
+		g_array_unref(enum_definition->value);
+	enum_definition->value = qs;
+	return 0;
 }
 
-/*
- * Arbitrarily choose the start of the first matching range.
- */
-void ctf_enum_write(struct stream_pos *pos,
-		    const struct type_enum *dest,
-		    GQuark q)
+int ctf_enum_write(struct stream_pos *pos, struct definition *definition)
 {
-	const struct type_integer *integer_type = dest->integer_type;
-	GArray *array;
-
-	array = enum_quark_to_range_set(dest, q);
-	assert(array);
+	struct definition_enum *enum_definition =
+		container_of(definition, struct definition_enum, p);
+	struct definition_integer *integer_definition =
+		enum_definition->integer;
 
-	if (!integer_type->signedness) {
-		uint64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
-		ctf_uint_write(pos, integer_type, v);
-	} else {
-		int64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
-		ctf_int_write(pos, integer_type, v);
-	}
+	return ctf_integer_write(pos, &integer_definition->p);
 }