X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fenum.c;h=37859f03a5afb040cc90abfeab9ebbd674a9ce0e;hp=a209b47d0cdc1f169ce71b544a339bf98f7a8965;hb=7fe001942cc8ece60d945cbfbd1d135ff548dc7d;hpb=11d43b909baeee566511acfec577d4605386fa09

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index a209b47d..37859f03 100644
--- a/formats/ctf/types/enum.c
+++ b/formats/ctf/types/enum.c
@@ -27,18 +27,17 @@
 GQuark ctf_enum_read(struct stream_pos *pos,
 		     const struct type_class_enum *src)
 {
-	struct type_class_bitfield *bitfield_class = &src->p;
-	struct type_class_integer *int_class = &bitfield_class->p;
+	struct type_class_integer *int_class = &src->p;
 
 	if (!int_class->signedness) {
 		uint64_t v;
 
-		v = ctf_bitfield_unsigned_read(pos, bitfield_class);
+		v = ctf_uint_read(pos, int_class);
 		return enum_uint_to_quark(src, v);
 	} else {
 		int64_t v;
 
-		v = fsrc->bitfield_signed_read(pos, bitfield_class);
+		v = fsrc->ctf_int_read(pos, int_class);
 		return enum_int_to_quark(src, v);
 	}
 }
@@ -47,18 +46,17 @@ size_t ctf_enum_write(struct stream_pos *pos,
 		      const struct type_class_enum *dest,
 		      GQuark q)
 {
-	struct type_class_bitfield *bitfield_class = &dest->p;
-	struct type_class_integer *int_class = &bitfield_class->p;
+	struct type_class_integer *int_class = &dest->p;
 
 	if (!int_class->signedness) {
 		uint64_t v;
 
 		v = enum_quark_to_uint(dest, q);
-		return ctf_bitfield_unsigned_write(pos, bitfield_class, v);
+		return ctf_uint_write(pos, int_class, v);
 	} else {
 		int64_t v;
 
 		v = enum_quark_to_int(dest, q);
-		return ctf_bitfield_signed_write(pos, bitfield_class, v);
+		return ctf_int_write(pos, int_class, v);
 	}
 }