Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a spare 'timeval' structure - makes this version of this function 

match some of the other copies lurking in the world of compat.
This commit is contained in:
dsl 2007-06-16 19:55:26 +00:00
parent 8e418a4b13
commit 5977ce1bd5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/compat/linux32/common/linux32_unistd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux32_unistd.c,v 1.9 2007/04/22 08:29:58 dsl Exp $ */
/* $NetBSD: linux32_unistd.c,v 1.10 2007/06/16 19:55:26 dsl Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux32_unistd.c,v 1.9 2007/04/22 08:29:58 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux32_unistd.c,v 1.10 2007/06/16 19:55:26 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -199,11 +199,11 @@ linux32_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout)
fd_set *readfds, *writefds, *exceptfds;
struct timeval *timeout;
{
struct timeval tv0, tv1, utv, otv, *tv = NULL;
struct timeval tv0, tv1, utv, *tv = NULL;
struct netbsd32_timeval utv32;
int error;
timerclear(&otv); /* XXX GCC4 */
timerclear(&utv); /* XXX GCC4 */
/*
* Store current time for computation of the amount of
@ -214,7 +214,6 @@ linux32_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout)
return error;
netbsd32_to_timeval(&utv32, &utv);
otv = utv;
if (itimerfix(&utv)) {
/*
@ -257,7 +256,7 @@ linux32_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout)
*/
microtime(&tv1);
timersub(&tv1, &tv0, &tv1);
timersub(&otv, &tv1, &utv);
timersub(&utv, &tv1, &utv);
if (utv.tv_sec < 0)
timerclear(&utv);
} else {