From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 27 Sep 2010 21:46:05 +0000 (-0400)
Subject: float: remove unrequired type conversions
X-Git-Tag: v0.1~240
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=dd617f8ac309ea811019b6be7edc8b700435662b

float: remove unrequired type conversions

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lib/types/float.c b/lib/types/float.c
index bc271610..eb0291ec 100644
--- a/lib/types/float.c
+++ b/lib/types/float.c
@@ -74,8 +74,11 @@ struct pos_len {
 void ctf_float_copy(unsigned char *destp, const struct ctf_float *dest,
 		    const unsigned char *src, const struct ctf_float *src)
 {
-	unsigned long long tmp;
 	struct pos_len destpos, srcpos;
+	union {
+		unsigned long long u;
+		long long s;
+	} tmp;
 
 	destpos.len = dest.exp_len + dest.mantissa_len;
 	if (dest.byte_order == LITTLE_ENDIAN) {
@@ -100,22 +103,22 @@ void ctf_float_copy(unsigned char *destp, const struct ctf_float *dest,
 	}
 
 	/* sign */
-	tmp = bitfield_unsigned_read(ptr, srcpos.sign_start, 1,
-				     src->byte_order);
+	tmp.u = bitfield_unsigned_read(ptr, srcpos.sign_start, 1,
+				       src->byte_order);
 	bitfield_unsigned_write(&u.bits, destpos.sign_start, 1,
-				dest->byte_order, tmp);
+				dest->byte_order, tmp.u);
 
 	/* mantissa (without leading 1). No sign extend. */
-	tmp = bitfield_unsigned_read(ptr, srcpos.mantissa_start,
-				     src->mantissa_len - 1, src->byte_order);
+	tmp.u = bitfield_unsigned_read(ptr, srcpos.mantissa_start,
+				       src->mantissa_len - 1, src->byte_order);
 	bitfield_unsigned_write(&u.bits, destpos.mantissa_start,
-				dest->mantissa_len - 1, dest->byte_order, tmp);
+				dest->mantissa_len - 1, dest->byte_order, tmp.u);
 
 	/* exponent, with sign-extend. */
-	tmp = bitfield_signed_read(ptr, srcpos.exp_start, src->exp_len,
-				   src->byte_order);
+	tmp.s = bitfield_signed_read(ptr, srcpos.exp_start, src->exp_len,
+				     src->byte_order);
 	bitfield_signed_write(&u.bits, destpos.exp_start, dest->exp_len,
-			      dest->byte_order, tmp);
+			      dest->byte_order, tmp.s);
 }
 
 double ctf_double_read(const unsigned char *ptr, const struct ctf_float *src)