X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf%2Ftypes%2Fenum.c;h=15e2590ad6b2cb1c65e57857234eb91dfe1ba22f;hb=7fb210365ad968646a0088d80f709165bf068950;hp=e0bb545b72963b18fcb7f9c860c6309f00bfac25;hpb=47e0f2e23aef98a584bf964754ab1e29c2897cfb;p=babeltrace.git

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index e0bb545b..15e2590a 100644
--- a/formats/ctf/types/enum.c
+++ b/formats/ctf/types/enum.c
@@ -3,7 +3,7 @@
  *
  * Enumeration mapping strings (quarks) from/to integers.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - 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
@@ -20,20 +20,23 @@
 #include <stdint.h>
 #include <glib.h>
 
+/*
+ * The caller should unref the GArray.
+ */
 GArray *ctf_enum_read(struct stream_pos *pos,
-		      const struct type_class_enum *src)
+		      const struct declaration_enum *src)
 {
-	const struct type_class_integer *int_class = &src->p;
+	const struct declaration_integer *integer_declaration = src->integer_declaration;
 
-	if (!int_class->signedness) {
+	if (!integer_declaration->signedness) {
 		uint64_t v;
 
-		v = ctf_uint_read(pos, int_class);
+		v = ctf_uint_read(pos, integer_declaration);
 		return enum_uint_to_quark_set(src, v);
 	} else {
 		int64_t v;
 
-		v = ctf_int_read(pos, int_class);
+		v = ctf_int_read(pos, integer_declaration);
 		return enum_int_to_quark_set(src, v);
 	}
 }
@@ -42,20 +45,20 @@ GArray *ctf_enum_read(struct stream_pos *pos,
  * Arbitrarily choose the start of the first matching range.
  */
 void ctf_enum_write(struct stream_pos *pos,
-		    const struct type_class_enum *dest,
+		    const struct declaration_enum *dest,
 		    GQuark q)
 {
-	const struct type_class_integer *int_class = &dest->p;
+	const struct declaration_integer *integer_declaration = dest->integer_declaration;
 	GArray *array;
 
 	array = enum_quark_to_range_set(dest, q);
 	assert(array);
 
-	if (!int_class->signedness) {
+	if (!integer_declaration->signedness) {
 		uint64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
-		ctf_uint_write(pos, int_class, v);
+		ctf_uint_write(pos, integer_declaration, v);
 	} else {
 		int64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
-		ctf_int_write(pos, int_class, v);
+		ctf_int_write(pos, integer_declaration, v);
 	}
 }