X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Feventl.c;h=f2963a1b0f954468d1422177ab9d457cc2fd019a;hp=614613840b81b04409d4964ca81afd1f247ef3b8;hb=3576736bac485d8f04b2fc4f6b5cfcef7576d741;hpb=c038a022f891ee58e6d30aec93644d17d2b686d6 diff --git a/src/eventl.c b/src/eventl.c index 6146138..f2963a1 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: eventl.c,v 1.16 2007-11-12 08:41:56 adam Exp $ + * $Id: eventl.c,v 1.17 2007-11-30 11:44:47 adam Exp $ */ /** @@ -96,21 +96,21 @@ int iochan_event_loop(IOCHAN *iochans) } for (p = *iochans; p; p = p->next) no_fds++; - fds = xmalloc(no_fds * sizeof(*fds)); + fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds)); for (i = 0, p = *iochans; p; p = p->next, i++) { time_t w, ftime; - enum yaz_poll_mask input_mask = 0; + enum yaz_poll_mask input_mask = yaz_poll_none; yaz_log(log_level, "fd=%d flags=%d force_event=%d", p->fd, p->flags, p->force_event); if (p->force_event) tv_sec = 0; /* polling select */ if (p->flags & EVENT_INPUT) - input_mask += yaz_poll_read; + yaz_poll_add(input_mask, yaz_poll_read); if (p->flags & EVENT_OUTPUT) - input_mask += yaz_poll_write; + yaz_poll_add(input_mask, yaz_poll_write); if (p->flags & EVENT_EXCEPT) - input_mask += yaz_poll_except; + yaz_poll_add(input_mask, yaz_poll_except); if (p->max_idle && p->last_event) { ftime = p->last_event + p->max_idle;