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

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index d0b284e6..15e2590a 100644
--- a/formats/ctf/types/enum.c
+++ b/formats/ctf/types/enum.c
@@ -24,19 +24,19 @@
  * The caller should unref the GArray.
  */
 GArray *ctf_enum_read(struct stream_pos *pos,
-		      const struct type_enum *src)
+		      const struct declaration_enum *src)
 {
-	const struct type_integer *integer_type = src->integer_type;
+	const struct declaration_integer *integer_declaration = src->integer_declaration;
 
-	if (!integer_type->signedness) {
+	if (!integer_declaration->signedness) {
 		uint64_t v;
 
-		v = ctf_uint_read(pos, integer_type);
+		v = ctf_uint_read(pos, integer_declaration);
 		return enum_uint_to_quark_set(src, v);
 	} else {
 		int64_t v;
 
-		v = ctf_int_read(pos, integer_type);
+		v = ctf_int_read(pos, integer_declaration);
 		return enum_int_to_quark_set(src, v);
 	}
 }
@@ -45,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_enum *dest,
+		    const struct declaration_enum *dest,
 		    GQuark q)
 {
-	const struct type_integer *integer_type = dest->integer_type;
+	const struct declaration_integer *integer_declaration = dest->integer_declaration;
 	GArray *array;
 
 	array = enum_quark_to_range_set(dest, q);
 	assert(array);
 
-	if (!integer_type->signedness) {
+	if (!integer_declaration->signedness) {
 		uint64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
-		ctf_uint_write(pos, integer_type, 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, integer_type, v);
+		ctf_int_write(pos, integer_declaration, v);
 	}
 }