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
This commit is contained in:
Robert Watson 2017-01-28 12:26:22 +00:00
parent d166e6c63f
commit 55e0d88afd
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=312919

View File

@ -188,31 +188,31 @@ 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);
}
}
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