From 32ca5ef3ff3069bdaae5f95be1900a3c3f831247 Mon Sep 17 00:00:00 2001 From: nsz Date: Tue, 13 Mar 2012 21:11:46 +0100 Subject: [PATCH] math cleanup: use 1.0f instead of 1.0F --- src/math/hypotf.c | 2 +- src/math/pow.c | 2 +- src/math/powf.c | 2 +- src/math/truncf.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/math/hypotf.c b/src/math/hypotf.c index 40acd917..9fd77e6a 100644 --- a/src/math/hypotf.c +++ b/src/math/hypotf.c @@ -40,7 +40,7 @@ float hypotf(float x, float y) if (ha > 0x58800000) { /* a > 2**50 */ if(ha >= 0x7f800000) { /* Inf or NaN */ /* Use original arg order iff result is NaN; quieten sNaNs. */ - w = fabsf(x+0.0F) - fabsf(y+0.0F); + w = fabsf(x+0.0f) - fabsf(y+0.0f); if (ha == 0x7f800000) w = a; if (hb == 0x7f800000) w = b; return w; diff --git a/src/math/pow.c b/src/math/pow.c index f843645d..5bcedd5b 100644 --- a/src/math/pow.c +++ b/src/math/pow.c @@ -112,7 +112,7 @@ double pow(double x, double y) /* y != zero: result is NaN if either arg is NaN */ if (ix > 0x7ff00000 || (ix == 0x7ff00000 && lx != 0) || iy > 0x7ff00000 || (iy == 0x7ff00000 && ly != 0)) - return (x+0.0)+(y+0.0); // FIXME: x+y ? + return (x+0.0) + (y+0.0); /* determine if y is an odd int when x < 0 * yisint = 0 ... y is not an integer diff --git a/src/math/powf.c b/src/math/powf.c index c78eb12f..01aced0e 100644 --- a/src/math/powf.c +++ b/src/math/powf.c @@ -70,7 +70,7 @@ float powf(float x, float y) /* y != zero: result is NaN if either arg is NaN */ if (ix > 0x7f800000 || iy > 0x7f800000) - return (x+0.0F) + (y+0.0F); + return (x+0.0f) + (y+0.0f); /* determine if y is an odd int when x < 0 * yisint = 0 ... y is not an integer diff --git a/src/math/truncf.c b/src/math/truncf.c index 209586e1..0afcdfbf 100644 --- a/src/math/truncf.c +++ b/src/math/truncf.c @@ -20,7 +20,7 @@ #include "libm.h" -static const float huge = 1.0e30F; +static const float huge = 1.0e30f; float truncf(float x) { @@ -32,14 +32,14 @@ float truncf(float x) if (j0 < 23) { if (j0 < 0) { /* |x|<1, return 0*sign(x) */ /* raise inexact if x != 0 */ - if (huge+x > 0.0F) + if (huge+x > 0.0f) i0 &= 0x80000000; } else { i = 0x007fffff>>j0; if ((i0&i) == 0) return x; /* x is integral */ /* raise inexact */ - if (huge+x > 0.0F) + if (huge+x > 0.0f) i0 &= ~i; } } else { -- 2.25.1