svn commit: r319497 - stable/11/tests/sys/aio

[Alan Somers]

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