From: Szabolcs Nagy <nsz@port70.net>
Date: Fri, 30 May 2014 15:09:53 +0000 (+0200)
Subject: use cleaner code for handling float rounding in vfprintf
X-Git-Tag: v1.1.2~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bff6095d915f3e41206e47ea2a570ecb937ef926;p=oweals%2Fmusl.git

use cleaner code for handling float rounding in vfprintf

CONCAT(0x1p,LDBL_MANT_DIG) is not safe outside of libc,
use 2/LDBL_EPSILON instead.

fix was proposed by Morten Welinder.
---

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index f6e7f38d..ea257720 100644
--- a/src/stdio/vfprintf.c
+++ b/src/stdio/vfprintf.c
@@ -13,8 +13,6 @@
 
 #define MAX(a,b) ((a)>(b) ? (a) : (b))
 #define MIN(a,b) ((a)<(b) ? (a) : (b))
-#define CONCAT2(x,y) x ## y
-#define CONCAT(x,y) CONCAT2(x,y)
 
 /* Convenient bit representation for modifier flags, which all fall
  * within 31 codepoints of the space character. */
@@ -343,7 +341,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
 		x = *d % i;
 		/* Are there any significant digits past j? */
 		if (x || d+1!=z) {
-			long double round = CONCAT(0x1p,LDBL_MANT_DIG);
+			long double round = 2/LDBL_EPSILON;
 			long double small;
 			if (*d/i & 1) round += 2;
 			if (x<i/2) small=0x0.8p0;