X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fpoll.c;h=4c766058cdfb8b1681797aca8debf2b3134fd1f2;hp=4bd35c0170577d10280e48a38f02ce5b2d80837c;hb=d67990f0801618bce56afe464b3492b6eb81b309;hpb=91c35d653aea231aff9efc3eef6a6ab6662dd129

diff --git a/src/poll.c b/src/poll.c
index 4bd35c0..4c76605 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: poll.c,v 1.3 2007-11-10 08:59:31 adam Exp $
+ * $Id: poll.c,v 1.5 2008-01-21 13:09:07 adam Exp $
  */
 /**
  * \file 
@@ -82,18 +82,18 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     {
         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)
-                mask += yaz_poll_timeout;
+                yaz_poll_add(mask, yaz_poll_timeout);
             else
             {
                 if (FD_ISSET(fd, &input))
-                    mask += yaz_poll_read;
+                    yaz_poll_add(mask, yaz_poll_read);
                 if (FD_ISSET(fd, &output))
-                    mask += yaz_poll_write;
+                    yaz_poll_add(mask, yaz_poll_write);
                 if (FD_ISSET(fd, &except))
-                    mask += yaz_poll_except;
+                    yaz_poll_add(mask, yaz_poll_except);
             }
             fds[i].output_mask = mask;
         }
@@ -131,17 +131,19 @@ int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     {
         for (i = 0; i < num_fds; i++)
         {
-            enum yaz_poll_mask mask = 0;
+            enum yaz_poll_mask mask = yaz_poll_none;
             if (!r)
-                mask += yaz_poll_timeout;
+                yaz_poll_add(mask, yaz_poll_timeout);
             else
             {
                 if (pollfds[i].revents & POLLIN)
-                    mask += yaz_poll_read;
+                    yaz_poll_add(mask, yaz_poll_read);
                 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;
         }