Add explicit braces to avoid ambiguous else. Pointed out by theo.

10 files changed, 27 insertions, 18 deletions

diff --git a/lib/libm/src/e_logf.c b/lib/libm/src/e_logf.c
index 717ae48f071..543f33a0d1f 100644
--- a/lib/libm/src/e_logf.c
+++ b/lib/libm/src/e_logf.c
@@ -54,8 +54,8 @@ logf(float x)
 	k += (i>>23);
 	f = x-(float)1.0;
 	if((0x007fffff&(15+ix))<16) {	/* |f| < 2**-20 */
-	    if(f==zero) if(k==0) return zero;  else {dk=(float)k;
-				 return dk*ln2_hi+dk*ln2_lo;}
+	    if(f==zero) {if(k==0) return zero;  else {dk=(float)k;
+				  return dk*ln2_hi+dk*ln2_lo;}}
 	    R = f*f*((float)0.5-(float)0.33333333333333333*f);
 	    if(k==0) return f-R; else {dk=(float)k;
 	    	     return dk*ln2_hi-((R-dk*ln2_lo)-f);}
diff --git a/lib/libm/src/s_expm1.c b/lib/libm/src/s_expm1.c
index cfb3371c4e6..9c82a2b74ef 100644
--- a/lib/libm/src/s_expm1.c
+++ b/lib/libm/src/s_expm1.c
@@ -188,9 +188,10 @@ expm1(double x)
 	    e  = (x*(e-c)-c);
 	    e -= hxs;
 	    if(k== -1) return 0.5*(x-e)-0.5;
-	    if(k==1) 
+	    if(k==1) {
 	       	if(x < -0.25) return -2.0*(e-(x+0.5));
 	       	else 	      return  one+2.0*(x-e);
+	    }
 	    if (k <= -2 || k>56) {   /* suffice to return exp(x)-1 */
 	        u_int32_t high;
 	        y = one-(e-x);
diff --git a/lib/libm/src/s_expm1f.c b/lib/libm/src/s_expm1f.c
index 287c365b2cd..69b25394aa2 100644
--- a/lib/libm/src/s_expm1f.c
+++ b/lib/libm/src/s_expm1f.c
@@ -91,9 +91,10 @@ expm1f(float x)
 	    e  = (x*(e-c)-c);
 	    e -= hxs;
 	    if(k== -1) return (float)0.5*(x-e)-(float)0.5;
-	    if(k==1) 
+	    if(k==1) {
 	       	if(x < (float)-0.25) return -(float)2.0*(e-(x+(float)0.5));
 	       	else 	      return  one+(float)2.0*(x-e);
+	    }
 	    if (k <= -2 || k>56) {   /* suffice to return exp(x)-1 */
 	        int32_t i;
 	        y = one-(e-x);
diff --git a/lib/libm/src/s_fmax.c b/lib/libm/src/s_fmax.c
index 3d76b4dfe91..0f4a8cb8715 100644
--- a/lib/libm/src/s_fmax.c
+++ b/lib/libm/src/s_fmax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fmax.c,v 1.9 2013/07/03 04:46:36 espie Exp $	*/
+/*	$OpenBSD: s_fmax.c,v 1.10 2013/11/12 18:28:02 martynas Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -38,11 +38,12 @@ fmax(double x, double y)
 		return (x);
 
 	/* Handle comparisons of signed zeroes. */
-	if (signbit(x) != signbit(y))
+	if (signbit(x) != signbit(y)) {
 		if (signbit(x))
 			return (y);
 		else
 			return (x);
+	}
 
 	return (x > y ? x : y);
 }
diff --git a/lib/libm/src/s_fmaxf.c b/lib/libm/src/s_fmaxf.c
index 7cd2c39edb5..232efaf0792 100644
--- a/lib/libm/src/s_fmaxf.c
+++ b/lib/libm/src/s_fmaxf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fmaxf.c,v 1.2 2008/09/11 19:18:12 martynas Exp $	*/
+/*	$OpenBSD: s_fmaxf.c,v 1.3 2013/11/12 18:28:02 martynas Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -37,11 +37,12 @@ fmaxf(float x, float y)
 		return (x);
 
 	/* Handle comparisons of signed zeroes. */
-	if (signbit(x) != signbit(y))
+	if (signbit(x) != signbit(y)) {
 		if (signbit(x))
 			return (y);
 		else
 			return (x);
+	}
 
 	return (x > y ? x : y);
 }
diff --git a/lib/libm/src/s_fmaxl.c b/lib/libm/src/s_fmaxl.c
index 0968f084d2b..a8704c91291 100644
--- a/lib/libm/src/s_fmaxl.c
+++ b/lib/libm/src/s_fmaxl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fmaxl.c,v 1.1 2008/12/09 20:00:35 martynas Exp $	*/
+/*	$OpenBSD: s_fmaxl.c,v 1.2 2013/11/12 18:28:02 martynas Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -37,11 +37,12 @@ fmaxl(long double x, long double y)
 		return (x);
 
 	/* Handle comparisons of signed zeroes. */
-	if (signbit(x) != signbit(y))
+	if (signbit(x) != signbit(y)) {
 		if (signbit(x))
 			return (y);
 		else
 			return (x);
+	}
 
 	return (x > y ? x : y);
 }
diff --git a/lib/libm/src/s_fmin.c b/lib/libm/src/s_fmin.c
index 822a3b5366a..7b99b914a85 100644
--- a/lib/libm/src/s_fmin.c
+++ b/lib/libm/src/s_fmin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fmin.c,v 1.9 2013/07/03 04:46:36 espie Exp $	*/
+/*	$OpenBSD: s_fmin.c,v 1.10 2013/11/12 18:28:02 martynas Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -38,11 +38,12 @@ fmin(double x, double y)
 		return (x);
 
 	/* Handle comparisons of signed zeroes. */
-	if (signbit(x) != signbit(y))
+	if (signbit(x) != signbit(y)) {
 		if (signbit(y))
 			return (y);
 		else
 			return (x);
+	}
 
 	return (x < y ? x : y);
 }
diff --git a/lib/libm/src/s_fminf.c b/lib/libm/src/s_fminf.c
index 4567fbcd627..b307450ccb8 100644
--- a/lib/libm/src/s_fminf.c
+++ b/lib/libm/src/s_fminf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fminf.c,v 1.2 2008/09/11 19:18:12 martynas Exp $	*/
+/*	$OpenBSD: s_fminf.c,v 1.3 2013/11/12 18:28:02 martynas Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -37,11 +37,12 @@ fminf(float x, float y)
 		return (x);
 
 	/* Handle comparisons of signed zeroes. */
-	if (signbit(x) != signbit(y))
+	if (signbit(x) != signbit(y)) {
 		if (signbit(y))
 			return (y);
 		else
 			return (x);
+	}
 
 	return (x < y ? x : y);
 }
diff --git a/lib/libm/src/s_fminl.c b/lib/libm/src/s_fminl.c
index 4bdd92d94c6..fdceffe3b6e 100644
--- a/lib/libm/src/s_fminl.c
+++ b/lib/libm/src/s_fminl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fminl.c,v 1.1 2008/12/09 20:00:35 martynas Exp $	*/
+/*	$OpenBSD: s_fminl.c,v 1.2 2013/11/12 18:28:02 martynas Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -37,11 +37,12 @@ fminl(long double x, long double y)
 		return (x);
 
 	/* Handle comparisons of signed zeroes. */
-	if (signbit(x) != signbit(y))
+	if (signbit(x) != signbit(y)) {
 		if (signbit(y))
 			return (y);
 		else
 			return (x);
+	}
 
 	return (x < y ? x : y);
 }
diff --git a/lib/libm/src/s_scalbnl.c b/lib/libm/src/s_scalbnl.c
index 6c6759e1a1b..7ff444815b8 100644
--- a/lib/libm/src/s_scalbnl.c
+++ b/lib/libm/src/s_scalbnl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_scalbnl.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
+/*	$OpenBSD: s_scalbnl.c,v 1.3 2013/11/12 18:28:02 martynas Exp $	*/
 /* @(#)s_scalbn.c 5.1 93/09/24 */
 /*
  * ====================================================
@@ -65,10 +65,11 @@ scalbnl (long double x, int n)
         if (k >= 0x7fff) return huge*copysignl(huge,x); /* overflow  */
         if (k > 0) 				/* normal result */
 	    {u.bits.ext_exp = k; return u.e;}
-        if (k <= -128)
+        if (k <= -128) {
             if (n > 50000) 	/* in case integer overflow in n+k */
 		return huge*copysign(huge,x);	/*overflow*/
 	    else return tiny*copysign(tiny,x); 	/*underflow*/
+	}
         k += 128;				/* subnormal result */
 	u.bits.ext_exp = k;
         return u.e*0x1p-128;