X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Finteger.c;h=127b8062bf6901240ad3c38d9f6082cae2cbdb71;hb=c054553dac076f91196b372fa19efaf2adc4e4f9;hp=003584f1a78fe54492cc34c08fc306fe548e8c38;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271;p=babeltrace.git

diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c
index 003584f1..127b8062 100644
--- a/formats/ctf/types/integer.c
+++ b/formats/ctf/types/integer.c
@@ -16,8 +16,8 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <ctf/ctf-types.h>
-#include <ctf/bitfield.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/bitfield.h>
 #include <stdint.h>
 #include <glib.h>
 #include <endian.h>
@@ -188,67 +188,67 @@ end:
 }
 
 uint64_t ctf_uint_read(struct stream_pos *pos,
-			const struct type_class_bitfield *int_class)
+			const struct type_class_integer *int_class)
 {
-	uint64_t v;
+	uint64_t v = 0;
 
 	align_pos(pos, int_class->p.alignment);
 	if (int_class->byte_order == LITTLE_ENDIAN)
-		ctf_bitfield_read_le(pos->base, pos->offset,
-				     int_class->len, &v);
+		bt_bitfield_read_le(pos->base, unsigned long, pos->offset,
+				    int_class->len, &v);
 	else
-		ctf_bitfield_read_be(pos->base, pos->offset,
-				     int_class->len, &v);
+		bt_bitfield_read_be(pos->base, unsigned long, pos->offset,
+				    int_class->len, &v);
 	move_pos(pos, int_class->len);
 	return v;
 }
 
 int64_t ctf_int_read(struct stream_pos *pos,
-			const struct type_class_bitfield *int_class)
+			const struct type_class_integer *int_class)
 {
-	int64_t v;
+	int64_t v = 0;
 
 	align_pos(pos, int_class->p.alignment);
 	if (int_class->byte_order == LITTLE_ENDIAN)
-		ctf_bitfield_read_le(pos->base, pos->offset,
-				     int_class->len, &v);
+		bt_bitfield_read_le(pos->base, unsigned long, pos->offset,
+				    int_class->len, &v);
 	else
-		ctf_bitfield_read_be(pos->base, pos->offset,
-				     int_class->len, &v);
+		bt_bitfield_read_be(pos->base, unsigned long, pos->offset,
+				    int_class->len, &v);
 	move_pos(pos, int_class->len);
 	return v;
 }
 
 void ctf_uint_write(struct stream_pos *pos,
-			const struct type_class_bitfield *int_class,
+			const struct type_class_integer *int_class,
 			uint64_t v)
 {
 	align_pos(pos, int_class->p.alignment);
 	if (pos->dummy)
 		goto end;
 	if (int_class->byte_order == LITTLE_ENDIAN)
-		ctf_bitfield_write_le(pos->base, pos->offset,
-				      int_class->len, v);
+		bt_bitfield_write_le(pos->base, unsigned long, pos->offset,
+				     int_class->len, v);
 	else
-		ctf_bitfield_write_be(pos->base, pos->offset,
-				      int_class->len,, v);
+		bt_bitfield_write_be(pos->base, unsigned long, pos->offset,
+				     int_class->len, v);
 end:
 	move_pos(pos, int_class->len);
 }
 
 void ctf_int_write(struct stream_pos *pos,
-			const struct type_class_bitfield *int_class,
+			const struct type_class_integer *int_class,
 			int64_t v)
 {
 	align_pos(pos, int_class->p.alignment);
 	if (pos->dummy)
 		goto end;
 	if (int_class->byte_order == LITTLE_ENDIAN)
-		ctf_bitfield_write_le(pos->base, pos->offset,
-				      int_class->len, v);
+		bt_bitfield_write_le(pos->base, unsigned long, pos->offset,
+				     int_class->len, v);
 	else
-		ctf_bitfield_write_be(pos->base, pos->offset,
-				      int_class->len, v);
+		bt_bitfield_write_be(pos->base, unsigned long, pos->offset,
+				     int_class->len, v);
 end:
 	move_pos(pos, int_class->len);
 }