Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Feb 2015 00:38:19 +0000 (UTC)
From:      Steve Kargl <kargl@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r278339 - head/lib/msun/src
Message-ID:  <201502070038.t170cJ8q036163@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kargl
Date: Sat Feb  7 00:38:18 2015
New Revision: 278339
URL: https://svnweb.freebsd.org/changeset/base/278339

Log:
  Truncate the exponent 'n' of type long to a domain contained
  within [INT_MIN, INT_MAX] where the magnitude of the lower
  and upper bounds are sufficiently large to span the range of
  scalbn[fl].
  
  While here, remove the GNU style bug in the function declarations.
  
  Reviewed by:	bde, pfg

Modified:
  head/lib/msun/src/s_scalbln.c

Modified: head/lib/msun/src/s_scalbln.c
==============================================================================
--- head/lib/msun/src/s_scalbln.c	Sat Feb  7 00:13:36 2015	(r278338)
+++ head/lib/msun/src/s_scalbln.c	Sat Feb  7 00:38:18 2015	(r278339)
@@ -27,38 +27,28 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <limits.h>
 #include <math.h>
 
+#define	NMAX	65536
+#define	NMIN	-65536
+
 double
-scalbln (double x, long n)
+scalbln(double x, long n)
 {
-	int in;
 
-	in = (int)n;
-	if (in != n)
-		in = (n > 0) ? INT_MAX: INT_MIN;
-	return (scalbn(x, in));
+	return (scalbn(x, (n > NMAX) ? NMAX : (n < NMIN) ? NMIN : (int)n));
 }
 
 float
-scalblnf (float x, long n)
+scalblnf(float x, long n)
 {
-	int in;
 
-	in = (int)n;
-	if (in != n)
-		in = (n > 0) ? INT_MAX: INT_MIN;
-	return (scalbnf(x, in));
+	return (scalbnf(x, (n > NMAX) ? NMAX : (n < NMIN) ? NMIN : (int)n));
 }
 
 long double
-scalblnl (long double x, long n)
+scalblnl(long double x, long n)
 {
-	int in;
 
-	in = (int)n;
-	if (in != n)
-		in = (n > 0) ? INT_MAX: INT_MIN;
-	return (scalbnl(x, in));
+	return (scalbnl(x, (n > NMAX) ? NMAX : (n < NMIN) ? NMIN : (int)n));
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502070038.t170cJ8q036163>