From 7c5182d3fd726a9fac4931b9680d9c68dbca2888 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Fri, 9 Nov 2007 22:54:54 +0000 Subject: [PATCH] review. git-svn-id: file:///svn/unbound/trunk@738 be551aaa-1e26-0410-a405-d3ace91eadb9 --- util/mini_event.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/mini_event.c b/util/mini_event.c index 36b995a52..cba2ba3ce 100644 --- a/util/mini_event.c +++ b/util/mini_event.c @@ -225,6 +225,8 @@ int event_base_loopexit(struct event_base* base, /** free event base, free events yourself */ void event_base_free(struct event_base* base) { + if(!base) + return; if(base->times) free(base->times); if(base->fds) @@ -271,7 +273,7 @@ int event_add(struct event* ev, struct timeval* tv) if(ev->ev_fd > ev->ev_base->maxfd) ev->ev_base->maxfd = ev->ev_fd; } - if(tv && ev->ev_events&EV_TIMEOUT) { + if(tv && (ev->ev_events&EV_TIMEOUT)) { #ifndef S_SPLINT_S struct timeval now; if(gettimeofday(&now, NULL) < 0) @@ -294,7 +296,7 @@ int event_del(struct event* ev) { if(ev->ev_fd != -1 && ev->ev_fd >= ev->ev_base->capfd) return -1; - if(ev->ev_events&EV_TIMEOUT) + if((ev->ev_events&EV_TIMEOUT)) (void)rbtree_delete(ev->ev_base->times, &ev->node); if((ev->ev_events&(EV_READ|EV_WRITE)) && ev->ev_fd != -1) { ev->ev_base->fds[ev->ev_fd] = NULL;