sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-03 12:58:35 +03:00
Code

r13500: Fix ordering of FD_* arguments.

Browse Source 
(This used to be commit ed619421de024c44f5f05b3c03bb5311ce73830f)
This commit is contained in:
James Peach 2006-02-15 01:05:06 +00:00 committed by Gerald (Jerry) Carter
parent 5c149702b0
commit 0c0ce531a8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/smbd/oplock_irix.c
View File

@ -94,7 +94,7 @@ static files_struct *irix_oplock_receive_message(fd_set *fds)
files_struct *fsp;
/* Ensure we only get one call per select fd set. */
FD_CLR(fds, oplock_pipe_read);
FD_CLR(oplock_pipe_read, fds);
/*
* Read one byte of zero to clear the
@ -220,22 +220,18 @@ static BOOL irix_oplock_msg_waiting(fd_set *fds)
return False;
if (fds) {
return FD_ISSET(oplock_pipe_read,fds);
}
FD_ZERO(&myfds);
maxfd = setup_oplock_select_set(&myfds);
/* Only do the select if we have something to select *on*. */
if (maxfd == 0) {
return False;
return FD_ISSET(oplock_pipe_read, fds);
}
/* Do a zero-time select. We just need to find out if there
* are any outstanding messages. We use sys_select_intr as
* we need to ignore any signals. */
FD_ZERO(&myfds);
FD_SET(oplock_pipe_read, &myfds);
to = timeval_set(0, 0);
selrtn = sys_select_intr(maxfd+1,&myfds,NULL,NULL,&to);
selrtn = sys_select_intr(oplock_pipe_read+1,&myfds,NULL,NULL,&to);
return (selrtn == 1) ? True : False;
}