Fixed bug #2068: pkg-config trouble.

[yaz-moved-to-github.git] / src / zoom-socket.c

diff --git a/src/zoom-socket.c b/src/zoom-socket.c
index da72eda..2d9d686 100644 (file)
--- a/src/zoom-socket.c
+++ b/src/zoom-socket.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoom-socket.c,v 1.5 2007-11-09 16:46:43 adam Exp $
+ * $Id: zoom-socket.c,v 1.8 2007-11-30 11:44:47 adam Exp $
  */
 /**
  * \file zoom-socket.c
@@ -29,7 +29,7 @@
 ZOOM_API(int)
     ZOOM_event_sys_yaz_poll(int no, ZOOM_connection *cs)
 {
-    struct yaz_poll_fd *yp = xmalloc(sizeof(*yp) * no);
+    struct yaz_poll_fd *yp = (struct yaz_poll_fd *) xmalloc(sizeof(*yp) * no);
     int i, r;
     int nfds = 0;
     int timeout = 30;
@@ -49,14 +49,14 @@ ZOOM_API(int)
             continue;
         if (mask)
         {
-            enum yaz_poll_mask input_mask = 0;
+            enum yaz_poll_mask input_mask = yaz_poll_none;
 
             if (mask & ZOOM_SELECT_READ)
-                input_mask += yaz_poll_read;
+                yaz_poll_add(input_mask, yaz_poll_read);
             if (mask & ZOOM_SELECT_WRITE)
-                input_mask += yaz_poll_write;
+                yaz_poll_add(input_mask, yaz_poll_write);
             if (mask & ZOOM_SELECT_EXCEPT)
-                input_mask += yaz_poll_except;
+                yaz_poll_add(input_mask, yaz_poll_except);
             yp[nfds].fd = fd;
             yp[nfds].input_mask = input_mask;
             yp[nfds].client_data = c;
@@ -68,12 +68,12 @@ ZOOM_API(int)
         xfree(yp);
         return 0;
     }
-    r = yaz_poll(yp, nfds, timeout);
+    r = yaz_poll(yp, nfds, timeout, 0);
     if (r >= 0)
     {
         for (i = 0; i < nfds; i++)
         {
-            ZOOM_connection c = yp[i].client_data;
+            ZOOM_connection c = (ZOOM_connection) yp[i].client_data;
             enum yaz_poll_mask output_mask = yp[i].output_mask;
             if (output_mask & yaz_poll_timeout)
                 ZOOM_connection_fire_event_timeout(c);
@@ -102,7 +102,8 @@ ZOOM_API(int)
     r = ZOOM_event_nonblock(no, cs);
     if (r)
         return r;
-    ZOOM_event_sys_yaz_poll(no, cs);
+    while (ZOOM_event_sys_yaz_poll(no, cs) < 0 && errno == EINTR)
+        ;
     return ZOOM_event_nonblock(no, cs);
 }