svn commit: r277948 - head/lib/msun/src

Pedro F. Giffuni pfg at FreeBSD.org
Fri Jan 30 19:19:05 UTC 2015


Author: pfg
Date: Fri Jan 30 19:19:03 2015
New Revision: 277948
URL: https://svnweb.freebsd.org/changeset/base/277948

Log:
  msun: use previously ignored value.
  
  This fixes evaluation of exceptional values in scalblnl().
  While here, simplify the code as suggested by Bruce Evans.
  
  Reported by:	clang static analyzer
  MFC after:	1 week

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

Modified: head/lib/msun/src/s_scalbln.c
==============================================================================
--- head/lib/msun/src/s_scalbln.c	Fri Jan 30 18:55:16 2015	(r277947)
+++ head/lib/msun/src/s_scalbln.c	Fri Jan 30 19:19:03 2015	(r277948)
@@ -35,13 +35,7 @@ scalbln (double x, long n)
 {
 	int in;
 
-	in = (int)n;
-	if (in != n) {
-		if (n > 0)
-			in = INT_MAX;
-		else
-			in = INT_MIN;
-	}
+	in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n;
 	return (scalbn(x, in));
 }
 
@@ -50,13 +44,7 @@ scalblnf (float x, long n)
 {
 	int in;
 
-	in = (int)n;
-	if (in != n) {
-		if (n > 0)
-			in = INT_MAX;
-		else
-			in = INT_MIN;
-	}
+	in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n;
 	return (scalbnf(x, in));
 }
 
@@ -65,12 +53,6 @@ scalblnl (long double x, long n)
 {
 	int in;
 
-	in = (int)n;
-	if (in != n) {
-		if (n > 0)
-			in = INT_MAX;
-		else
-			in = INT_MIN;
-	}
-	return (scalbnl(x, (int)n));
+	in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; 
+	return (scalbnl(x, in));
 }


More information about the svn-src-head mailing list