From owner-svn-src-all@freebsd.org  Sat Feb  4 16:02:51 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D2EBCD001A;
 Sat,  4 Feb 2017 16:02:51 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EDF2F27A;
 Sat,  4 Feb 2017 16:02:50 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v14G2od3057881;
 Sat, 4 Feb 2017 16:02:50 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v14G2ole057880;
 Sat, 4 Feb 2017 16:02:50 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201702041602.v14G2ole057880@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 4 Feb 2017 16:02:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r313214 - stable/10/tests/sys/kern/acct
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Feb 2017 16:02:51 -0000

Author: ngie
Date: Sat Feb  4 16:02:49 2017
New Revision: 313214
URL: https://svnweb.freebsd.org/changeset/base/313214

Log:
  MFC r312119,r312216,r312226:
  
  r312119:
  
  encode_long, encode_timeval: mechanically replace `exp` with `exponent`
  
  This helps fix a -Wshadow issue with exp(3) with tests/sys/acct/acct_test,
  which include math.h, which in turn defines exp(3)
  
  Tested with:	clang, gcc 4.2.1, gcc 4.9
  
  r312216:
  
  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.
  
  Requested by:	bde
  
  r312226:
  
  Fix typo in r312216
  
  I meant to replace "exp" with "exponent", not "expected"
  
  Pointyhat to:	ngie

Modified:
  stable/10/tests/sys/kern/acct/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tests/sys/kern/acct/Makefile
==============================================================================
--- stable/10/tests/sys/kern/acct/Makefile	Sat Feb  4 16:02:48 2017	(r313213)
+++ stable/10/tests/sys/kern/acct/Makefile	Sat Feb  4 16:02:49 2017	(r313214)
@@ -13,6 +13,7 @@ acct_test.o: convert.c
 
 convert.c: ${.CURDIR:H:H:H:H}/sys/kern/kern_acct.c
 	sed -n -e 's/log(/syslog(/g' \
+	       -e 's/exp/exponent/g' \
 	       -e '/FLOAT_CONVERSION_START/,/FLOAT_CONVERSION_END/p' ${.ALLSRC} >${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}