make splint complain less...

[ngircd.git] / src / ngircd / io.c

diff --git a/src/ngircd/io.c b/src/ngircd/io.c
index a04c81defa245495d3d2f636f733a3145ef635c2..bee798b745da9bb2028fbb2e79e64d1c98baf72b 100644 (file)
--- a/src/ngircd/io.c
+++ b/src/ngircd/io.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: io.c,v 1.12 2006/05/07 10:54:42 fw Exp $";
+static char UNUSED id[] = "$Id: io.c,v 1.14 2006/05/10 17:33:36 fw Exp $";
 
 #include <assert.h>
 #include <stdlib.h>
@@ -26,6 +26,8 @@ static char UNUSED id[] = "$Id: io.c,v 1.12 2006/05/07 10:54:42 fw Exp $";
 #include "io.h"
 #include "log.h"
 
+/* Enables extra debug messages in event add/delete/callback code. */
+/* #define DEBUG_IO */
 
 typedef struct {
  void (*callback)(int, short);
@@ -86,9 +88,12 @@ static io_event *
 io_event_get(int fd)
 {
        io_event *i;
+
        assert(fd >= 0);
-       i = (io_event *) array_get(&io_events, sizeof(io_event), fd);
-       assert(i);
+
+       i = (io_event *) array_get(&io_events, sizeof(io_event), (size_t) fd);
+
+       assert(i != NULL);
 
        return i;
 }
@@ -112,7 +117,7 @@ io_library_init(unsigned int eventsize)
                eventsize = FD_SETSIZE - 1;
 #endif
 #endif
-       if (eventsize && !array_alloc(&io_events, sizeof(io_event), eventsize))
+       if ((eventsize > 0) && !array_alloc(&io_events, sizeof(io_event), (size_t)eventsize))
                eventsize = 0;
 
 #ifdef IO_USE_EPOLL
@@ -131,7 +136,7 @@ io_library_init(unsigned int eventsize)
        FD_ZERO(&readers);
        FD_ZERO(&writers);
 #ifdef FD_SETSIZE
-       if (Conf_MaxConnections >= FD_SETSIZE) {
+       if (Conf_MaxConnections >= (int)FD_SETSIZE) {
                Log(LOG_WARNING,
                    "MaxConnections (%d) exceeds limit (%u), changed MaxConnections to %u.",
                    Conf_MaxConnections, FD_SETSIZE, FD_SETSIZE - 1);
@@ -207,7 +212,7 @@ io_event_create(int fd, short what, void (*cbfunc) (int, short))
 #endif                         /* FD_SETSIZE */
 #endif                         /* IO_USE_SELECT */
 
-       i = (io_event *) array_alloc(&io_events, sizeof(io_event), fd);
+       i = (io_event *) array_alloc(&io_events, sizeof(io_event), (size_t) fd);
        if (!i) {
                Log(LOG_WARNING,
                    "array_alloc failed: could not allocate space for %d io_event structures",
@@ -268,7 +273,7 @@ io_event_kqueue_commit_cache(void)
 
        events = array_start(&io_evcache);
 
-       assert(events);
+       assert(events != NULL);
 
        ret = kevent(io_masterfd, events, len, NULL, 0, NULL) == 0;
        if (ret)
@@ -309,11 +314,9 @@ io_event_add(int fd, short what)
 {
        io_event *i = io_event_get(fd);
 
-       assert(i != NULL);
-
        if (!i) return false;
        if (i->what == what) return true;
-#ifdef DEBUG
+#ifdef DEBUG_IO
        Log(LOG_DEBUG, "io_event_add(): fd %d (arg: %d), what %d.", i->fd, fd, what);
 #endif
        i->what |= what;
@@ -399,10 +402,9 @@ bool
 io_event_del(int fd, short what)
 {
        io_event *i = io_event_get(fd);
-#ifdef DEBUG
+#ifdef DEBUG_IO
        Log(LOG_DEBUG, "io_event_del(): trying to delete eventtype %d on fd %d", what, fd);
 #endif
-       assert(i != NULL);
        if (!i) return false;
 
        i->what &= ~what;
@@ -523,7 +525,7 @@ io_dispatch_kqueue(struct timeval *tv)
                        newevents_len = 0;
 #ifdef DEBUG
                if (newevents_len)
-                       assert(newevents);
+                       assert(newevents != NULL);
 #endif
                ret = kevent(io_masterfd, newevents, newevents_len, kev,
                             100, &ts);
@@ -535,12 +537,21 @@ io_dispatch_kqueue(struct timeval *tv)
                        return total;
 
                for (i = 0; i < ret; i++) {
+                       if (kev[i].flags & EV_EOF) {
+#ifdef DEBUG
+                               LogDebug("kev.flag has EV_EOF set, setting IO_ERROR",
+                                       kev[i].filter, kev[i].ident);
+#endif                         
+                               io_docallback((int)kev[i].ident, IO_ERROR);
+                               continue;
+                       }       
+
                        switch (kev[i].filter) {
                                case EVFILT_READ:
-                                       io_docallback(kev[i].ident, IO_WANTREAD);
+                                       io_docallback((int)kev[i].ident, IO_WANTREAD);
                                        break;
                                case EVFILT_WRITE:
-                                       io_docallback(kev[i].ident, IO_WANTWRITE);
+                                       io_docallback((int)kev[i].ident, IO_WANTWRITE);
                                        break;
                                default:
 #ifdef DEBUG
@@ -548,19 +559,9 @@ io_dispatch_kqueue(struct timeval *tv)
                                                kev[i].filter, kev[i].ident); /* Fall through */
 #endif
                                case EV_ERROR:
-                                       io_docallback(kev[i].ident, IO_ERROR);
+                                       io_docallback((int)kev[i].ident, IO_ERROR);
                                        break;
-                                               
                        }
-                       if (kev[i].flags & EV_EOF) {
-#ifdef DEBUG
-                               LogDebug("kev.flag has EV_EOF set, setting IO_ERROR",
-                                       kev[i].filter, kev[i].ident); /* Fall through */
-
-#endif                         
-                               io_docallback(kev[i].ident, IO_ERROR);
-
-                       }       
                }
                ts.tv_sec = 0;
                ts.tv_nsec = 0;
@@ -591,13 +592,14 @@ static void
 io_docallback(int fd, short what)
 {
        io_event *i;
-#ifdef DEBUG
+#ifdef DEBUG_IO
        Log(LOG_DEBUG, "doing callback for fd %d, what %d", fd, what);
 #endif
        i = io_event_get(fd);
-       assert(i);
 
-       if (i->callback)        /* callback might be 0 if previous callback function called io_close on this fd */
+       if (i->callback) {      /* callback might be NULL if a previous callback function 
+                                  called io_close on this fd */
                i->callback(fd, (what & IO_ERROR) ? i->what : what);
-       /* if error indicator is set, we return the event(s) the app asked for */
+       }       
+       /* if error indicator is set, we return the event(s) that were registered */
 }