X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=2586952632e69818e848cd8c41306eda07e04b43;hb=8099326b3438eb003bf3f9849ad1b3cd1f0d618c;hp=2daadf91e40de1325832d39e867ab6ff38e826f0;hpb=ca334c7230d120ffe211efbfd6efe467b5d4d794;p=babeltrace.git

diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c
index 2daadf91..25869526 100644
--- a/formats/ctf/types/float.c
+++ b/formats/ctf/types/float.c
@@ -31,7 +31,7 @@
 #include <babeltrace/ctf/types.h>
 #include <glib.h>
 #include <float.h>	/* C99 floating point definitions */
-#include <limits.h>	/* C99 limits */
+#include <babeltrace/compat/limits.h>	/* C99 limits */
 #include <babeltrace/endian.h>
 #include <pthread.h>
 
@@ -200,8 +200,11 @@ int ctf_float_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 	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;
-	ctf_align_pos(pos, float_declaration->p.alignment);
+	destp.content_size = destp.packet_size = sizeof(u) * CHAR_BIT;
+	if (!ctf_align_pos(pos, float_declaration->p.alignment)) {
+		ret = -EFAULT;
+		goto end_unref;
+	}
 	ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition);
 	switch (float_declaration->mantissa->len + 1) {
 	case FLT_MANT_DIG:
@@ -232,7 +235,7 @@ int ctf_float_write(struct bt_stream_pos *ppos, struct bt_definition *definition
 	union doubleIEEE754 u;
 	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;
 
@@ -256,7 +259,7 @@ int ctf_float_write(struct bt_stream_pos *ppos, struct bt_definition *definition
 	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;
+	srcp.content_size = srcp.packet_size = sizeof(u) * CHAR_BIT;
 	switch (float_declaration->mantissa->len + 1) {
 	case FLT_MANT_DIG:
 		u.vf = float_definition->value;
@@ -268,7 +271,10 @@ int ctf_float_write(struct bt_stream_pos *ppos, struct bt_definition *definition
 		ret = -EINVAL;
 		goto end_unref;
 	}
-	ctf_align_pos(pos, float_declaration->p.alignment);
+	if (!ctf_align_pos(pos, float_declaration->p.alignment)) {
+		ret = -EFAULT;
+		goto end_unref;
+	}
 	ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat);
 
 end_unref:
@@ -278,6 +284,14 @@ end:
 	return ret;
 }
 
+double bt_get_float(const struct bt_definition *field)
+{
+	struct definition_float *definition =
+		container_of(field, struct definition_float, p);
+
+	return definition->value;
+}
+
 static
 void __attribute__((constructor)) ctf_float_init(void)
 {