X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=689028360d4fe8f258d307e014e54103fb03201e;hb=919bd0236b6b419217e1ad969301bf6efa3d7f67;hp=f46e26aee2e8dabdbdea6b7d0544ed87ff4d8900;hpb=1cf393f63db4dce618515749d5549564d1313ee4;p=babeltrace.git

diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c
index f46e26ae..68902836 100644
--- a/formats/ctf/types/float.c
+++ b/formats/ctf/types/float.c
@@ -165,7 +165,7 @@ static int _ctf_float_copy(struct bt_stream_pos *destp,
 	return 0;
 }
 
-int ctf_float_read(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_float_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_float *float_definition =
 		container_of(definition, struct definition_float, p);
@@ -173,7 +173,7 @@ int ctf_float_read(struct bt_stream_pos *ppos, struct definition *definition)
 		float_definition->declaration;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	union doubleIEEE754 u;
-	struct definition *tmpdef;
+	struct bt_definition *tmpdef;
 	struct definition_float *tmpfloat;
 	struct ctf_stream_pos destp;
 	struct mmap_align mma;
@@ -197,7 +197,7 @@ int ctf_float_read(struct bt_stream_pos *ppos, struct definition *definition)
 	}
 	tmpfloat = container_of(tmpdef, struct definition_float, p);
 	memset(&destp, 0, sizeof(destp));
-	ctf_init_pos(&destp, -1, O_RDWR);
+	ctf_init_pos(&destp, NULL, -1, O_RDWR);
 	mmap_align_set_addr(&mma, (char *) u.bits);
 	destp.base_mma = &mma;
 	destp.packet_size = sizeof(u) * CHAR_BIT;
@@ -222,7 +222,7 @@ end:
 	return ret;
 }
 
-int ctf_float_write(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_float_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_float *float_definition =
 		container_of(definition, struct definition_float, p);
@@ -230,9 +230,9 @@ int ctf_float_write(struct bt_stream_pos *ppos, struct definition *definition)
 		float_definition->declaration;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	union doubleIEEE754 u;
-	struct definition *tmpdef;
+	struct bt_definition *tmpdef;
 	struct definition_float *tmpfloat;
-	struct ctf_stream_pos srcp;
+	struct ctf_stream_pos srcp = { { 0 } };
 	struct mmap_align mma;
 	int ret;
 
@@ -253,7 +253,7 @@ int ctf_float_write(struct bt_stream_pos *ppos, struct definition *definition)
 		goto end;
 	}
 	tmpfloat = container_of(tmpdef, struct definition_float, p);
-	ctf_init_pos(&srcp, -1, O_RDONLY);
+	ctf_init_pos(&srcp, NULL, -1, O_RDONLY);
 	mmap_align_set_addr(&mma, (char *) u.bits);
 	srcp.base_mma = &mma;
 	srcp.packet_size = sizeof(u) * CHAR_BIT;