projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Choose IPV6 over IPV4 addrany addresses (bug #2350).
[yaz-moved-to-github.git]
/
src
/
poll.c
diff --git
a/src/poll.c
b/src/poll.c
index
4bd35c0
..
9c24f1e
100644
(file)
--- a/
src/poll.c
+++ b/
src/poll.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: poll.c,v 1.3 2007-11-10 08:59:31 adam Exp $
*/
/**
* \file
*/
/**
* \file
@@
-82,18
+80,18
@@
int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
for (i = 0; i < num_fds; i++)
{
{
for (i = 0; i < num_fds; i++)
{
- enum yaz_poll_mask mask = 0;
+ enum yaz_poll_mask mask = yaz_poll_none;
int fd = fds[i].fd;
if (!r)
int fd = fds[i].fd;
if (!r)
- mask += yaz_poll_timeout;
+ yaz_poll_add(mask, yaz_poll_timeout);
else
{
if (FD_ISSET(fd, &input))
else
{
if (FD_ISSET(fd, &input))
- mask += yaz_poll_read;
+ yaz_poll_add(mask, yaz_poll_read);
if (FD_ISSET(fd, &output))
if (FD_ISSET(fd, &output))
- mask += yaz_poll_write;
+ yaz_poll_add(mask, yaz_poll_write);
if (FD_ISSET(fd, &except))
if (FD_ISSET(fd, &except))
- mask += yaz_poll_except;
+ yaz_poll_add(mask, yaz_poll_except);
}
fds[i].output_mask = mask;
}
}
fds[i].output_mask = mask;
}
@@
-131,17
+129,19
@@
int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
for (i = 0; i < num_fds; i++)
{
{
for (i = 0; i < num_fds; i++)
{
- enum yaz_poll_mask mask = 0;
+ enum yaz_poll_mask mask = yaz_poll_none;
if (!r)
if (!r)
- mask += yaz_poll_timeout;
+ yaz_poll_add(mask, yaz_poll_timeout);
else
{
if (pollfds[i].revents & POLLIN)
else
{
if (pollfds[i].revents & POLLIN)
- mask += yaz_poll_read;
+ yaz_poll_add(mask, yaz_poll_read);
if (pollfds[i].revents & POLLOUT)
if (pollfds[i].revents & POLLOUT)
- mask += yaz_poll_write;
- if (pollfds[i].revents & POLLERR)
- mask += yaz_poll_except;
+ yaz_poll_add(mask, yaz_poll_write);
+ if (pollfds[i].revents & ~(POLLIN | POLLOUT))
+ {
+ yaz_poll_add(mask, yaz_poll_except);
+ }
}
fds[i].output_mask = mask;
}
}
fds[i].output_mask = mask;
}