svn commit: r312216 - in head: sys/kern tests/sys/kern/acct

[Ngie Cooper]

Author: ngie
Date: Sun Jan 15 09:25:33 2017
New Revision: 312216
URL: https://svnweb.freebsd.org/changeset/base/312216

Log:
  Revert r312119 and reword the intent to fix -Wshadow issues
  between exp(3) and `exp` var.
  
  The approach taken previously was not ideal for multiple
  functional and stylistic reasons.
  
  Add to existing sed call in Makefile to replace `exp` with
  `exponent` instead.
  
  MFC after:	13 days
  Requested by:	bde

Modified:
  head/sys/kern/kern_acct.c
  head/tests/sys/kern/acct/Makefile
Directory Properties:
  head/   (props changed)

Modified: head/sys/kern/kern_acct.c
==============================================================================
--- head/sys/kern/kern_acct.c	Sun Jan 15 09:13:41 2017	(r312215)
+++ head/sys/kern/kern_acct.c	Sun Jan 15 09:25:33 2017	(r312216)
@@ -469,8 +469,8 @@ static uint32_t
 encode_timeval(struct timeval tv)
 {
 	int log2_s;
-	int val, exponent;	/* Unnormalized value and exponent */
-	int norm_exponent;	/* Normalized exponent */
+	int val, exp;	/* Unnormalized value and exponent */
+	int norm_exp;	/* Normalized exponent */
 	int shift;
 
 	/*
@@ -481,7 +481,7 @@ encode_timeval(struct timeval tv)
 	if (tv.tv_sec == 0) {
 		if (tv.tv_usec == 0)
 			return (0);
-		exponent = 0;
+		exp = 0;
 		val = tv.tv_usec;
 	} else {
 		/*
@@ -490,24 +490,24 @@ encode_timeval(struct timeval tv)
 		 */
 		log2_s = fls(tv.tv_sec) - 1;
 		if (log2_s + LOG2_1M < CALC_BITS) {
-			exponent = 0;
+			exp = 0;
 			val = 1000000 * tv.tv_sec + tv.tv_usec;
 		} else {
-			exponent = log2_s + LOG2_1M - CALC_BITS;
+			exp = log2_s + LOG2_1M - CALC_BITS;
 			val = (unsigned int)(((uint64_t)1000000 * tv.tv_sec +
-			    tv.tv_usec) >> exponent);
+			    tv.tv_usec) >> exp);
 		}
 	}
 	/* Now normalize and pack the value into an IEEE-754 float. */
-	norm_exponent = fls(val) - 1;
-	shift = FLT_MANT_DIG - norm_exponent - 1;
+	norm_exp = fls(val) - 1;
+	shift = FLT_MANT_DIG - norm_exp - 1;
 #ifdef ACCT_DEBUG
 	printf("val=%d exp=%d shift=%d log2(val)=%d\n",
-	    val, exponent, shift, norm_exponent);
-	printf("exp=%x mant=%x\n", FLT_MAX_EXP - 1 + exponent + norm_exponent,
+	    val, exp, shift, norm_exp);
+	printf("exp=%x mant=%x\n", FLT_MAX_EXP - 1 + exp + norm_exp,
 	    ((shift > 0 ? (val << shift) : (val >> -shift)) & MANT_MASK));
 #endif
-	return (((FLT_MAX_EXP - 1 + exponent + norm_exponent) << (FLT_MANT_DIG - 1)) |
+	return (((FLT_MAX_EXP - 1 + exp + norm_exp) << (FLT_MANT_DIG - 1)) |
 	    ((shift > 0 ? val << shift : val >> -shift) & MANT_MASK));
 }
 
@@ -518,7 +518,7 @@ encode_timeval(struct timeval tv)
 static uint32_t
 encode_long(long val)
 {
-	int norm_exponent;	/* Normalized exponent */
+	int norm_exp;	/* Normalized exponent */
 	int shift;
 
 	if (val == 0)
@@ -529,15 +529,15 @@ encode_long(long val)
 		    val);
 		val = LONG_MAX;
 	}
-	norm_exponent = fls(val) - 1;
-	shift = FLT_MANT_DIG - norm_exponent - 1;
+	norm_exp = fls(val) - 1;
+	shift = FLT_MANT_DIG - norm_exp - 1;
 #ifdef ACCT_DEBUG
 	printf("val=%d shift=%d log2(val)=%d\n",
-	    val, shift, norm_exponent);
-	printf("exp=%x mant=%x\n", FLT_MAX_EXP - 1 + exp + norm_exponent,
+	    val, shift, norm_exp);
+	printf("exp=%x mant=%x\n", FLT_MAX_EXP - 1 + exp + norm_exp,
 	    ((shift > 0 ? (val << shift) : (val >> -shift)) & MANT_MASK));
 #endif
-	return (((FLT_MAX_EXP - 1 + norm_exponent) << (FLT_MANT_DIG - 1)) |
+	return (((FLT_MAX_EXP - 1 + norm_exp) << (FLT_MANT_DIG - 1)) |
 	    ((shift > 0 ? val << shift : val >> -shift) & MANT_MASK));
 }
 

Modified: head/tests/sys/kern/acct/Makefile
==============================================================================
--- head/tests/sys/kern/acct/Makefile	Sun Jan 15 09:13:41 2017	(r312215)
+++ head/tests/sys/kern/acct/Makefile	Sun Jan 15 09:25:33 2017	(r312216)
@@ -13,6 +13,7 @@ acct_test.o: convert.c
 
 convert.c: ${SRCTOP}/sys/kern/kern_acct.c
 	sed -n -e 's/log(/syslog(/g' \
+	       -e 's/exp/expected/g' \
 	       -e '/FLOAT_CONVERSION_START/,/FLOAT_CONVERSION_END/p' ${.ALLSRC} >${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}