summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-02-15 01:05:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:10:07 -0500
commit0c0ce531a87f7e5f5a1a2980335322615a98c037 (patch)
treebd9caa374dbb7c1da51f0d8e2aea16e1df0c86fa
parent5c149702b0885db8d63f189f4bba0e17fdaad7a4 (diff)
downloadsamba-0c0ce531a87f7e5f5a1a2980335322615a98c037.tar.gz
samba-0c0ce531a87f7e5f5a1a2980335322615a98c037.tar.bz2
samba-0c0ce531a87f7e5f5a1a2980335322615a98c037.zip
r13500: Fix ordering of FD_* arguments.
(This used to be commit ed619421de024c44f5f05b3c03bb5311ce73830f)
-rw-r--r--source3/smbd/oplock_irix.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index 29bbb0f2ca..fa86211c7f 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -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;
}