Fix namespace pollution introduced in previous commit.
Reviewed by: phk
This commit is contained in:
parent
34893fe49b
commit
0ae0e1ea47
@ -67,7 +67,7 @@ svc_run()
|
||||
readfds = svc_fdset;
|
||||
cleanfds = svc_fdset;
|
||||
rwlock_unlock(&svc_fd_lock);
|
||||
switch (select(svc_maxfd+1, &readfds, NULL, NULL, &timeout)) {
|
||||
switch (_select(svc_maxfd+1, &readfds, NULL, NULL, &timeout)) {
|
||||
case -1:
|
||||
FD_ZERO(&readfds);
|
||||
if (errno == EINTR) {
|
||||
|
@ -357,10 +357,10 @@ again:
|
||||
cd->maxrec = r->maxrec;
|
||||
|
||||
if (cd->maxrec != 0) {
|
||||
flags = fcntl(sock, F_GETFL, 0);
|
||||
flags = _fcntl(sock, F_GETFL, 0);
|
||||
if (flags == -1)
|
||||
return (FALSE);
|
||||
if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) == -1)
|
||||
if (_fcntl(sock, F_SETFL, flags | O_NONBLOCK) == -1)
|
||||
return (FALSE);
|
||||
if (cd->recvsize > cd->maxrec)
|
||||
cd->recvsize = cd->maxrec;
|
||||
@ -488,7 +488,7 @@ read_vc(xprtp, buf, len)
|
||||
cfp = (struct cf_conn *)xprt->xp_p1;
|
||||
|
||||
if (cfp->nonblock) {
|
||||
len = read(sock, buf, (size_t)len);
|
||||
len = _read(sock, buf, (size_t)len);
|
||||
if (len < 0) {
|
||||
if (errno == EAGAIN)
|
||||
len = 0;
|
||||
@ -527,7 +527,7 @@ read_vc(xprtp, buf, len)
|
||||
} else
|
||||
goto fatal_err;
|
||||
} else {
|
||||
if ((len = read(sock, buf, (size_t)len)) > 0) {
|
||||
if ((len = _read(sock, buf, (size_t)len)) > 0) {
|
||||
gettimeofday(&cfp->last_recv_time, NULL);
|
||||
return (len);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user