From owner-svn-src-stable-11@freebsd.org  Fri Jun  2 15:11:44 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 CE2DFBF9787;
 Fri,  2 Jun 2017 15:11:44 +0000 (UTC)
 (envelope-from asomers@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 943D565861;
 Fri,  2 Jun 2017 15:11:44 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v52FBht3082371;
 Fri, 2 Jun 2017 15:11:43 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v52FBhNj082370;
 Fri, 2 Jun 2017 15:11:43 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201706021511.v52FBhNj082370@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 2 Jun 2017 15:11:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r319497 - stable/11/tests/sys/aio
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2017 15:11:44 -0000

Author: asomers
Date: Fri Jun  2 15:11:43 2017
New Revision: 319497
URL: https://svnweb.freebsd.org/changeset/base/319497

Log:
  MFC r312919 (by rwatson)
  
  Fix build of aio_test on MIPS, where the compiler warns about the local
  variable 'err' shadowing the global function err(3).  Which it does.
  
  Sponsored by: DARPA, AFRL
  Approved by:  re

Modified:
  stable/11/tests/sys/aio/aio_test.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/tests/sys/aio/aio_test.c
==============================================================================
--- stable/11/tests/sys/aio/aio_test.c	Fri Jun  2 14:17:14 2017	(r319496)
+++ stable/11/tests/sys/aio/aio_test.c	Fri Jun  2 15:11:43 2017	(r319497)
@@ -187,18 +187,18 @@ aio_context_init(struct aio_context *ac, int read_fd,
 static ssize_t
 poll(struct aiocb *aio)
 {
-	int err;
+	int error;
 
-	while ((err = aio_error(aio)) == EINPROGRESS && !aio_timedout)
+	while ((error = aio_error(aio)) == EINPROGRESS && !aio_timedout)
 		usleep(25000);
-	switch (err) {
+	switch (error) {
 		case EINPROGRESS:
 			errno = EINTR;
 			return (-1);
 		case 0:
 			return (aio_return(aio));
 		default:
-			return (err);
+			return (error);
 	}
 }
 
@@ -206,13 +206,13 @@ static ssize_t
 suspend(struct aiocb *aio)
 {
 	const struct aiocb *const iocbs[] = {aio};
-	int err;
+	int error;
 
-	err = aio_suspend(iocbs, 1, NULL);
-	if (err == 0)
+	error = aio_suspend(iocbs, 1, NULL);
+	if (error == 0)
 		return (aio_return(aio));
 	else
-		return (err);
+		return (error);
 }
 
 static ssize_t