Avoid spurious kqueue() engine warnings.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1335 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 748646b650c3e966fcbfbc4da5c93a0af7d7ed89..3a116939ff14faeb0d6e4cacb06e7c70b2255da5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-22  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/engine_kqueue.c (engine_delete): The kernel removes
+       close()'d FDs from the activity list, so don't try to remove the
+       FD here (the caller may have already close()'d it).
+
 2005-03-20  Michael Poole <mdpoole@troilus.org>
 
        * ircd/IPcheck.c: Fix typos in comments and strings to reduce

diff --git a/ircd/engine_kqueue.c b/ircd/engine_kqueue.c
index 6b4b29901522be4155ed3c9c73e9b48b8dc13848..577cac01d57cd4785dbbe70a26f00b61fda9daa8 100644 (file)
--- a/ircd/engine_kqueue.c
+++ b/ircd/engine_kqueue.c
@@ -298,11 +298,6 @@ engine_delete(struct Socket* sock)
   dellist[1].data = 0;
   dellist[1].udata = 0;
 
-  /* make it all go away */
-  if (kevent(kqueue_id, dellist, 2, 0, 0, 0) < 0)
-    log_write(LS_SOCKET, L_WARNING, 0,
-             "Unable to delete kevent items for socket %d", s_fd(sock));
-
   sockList[s_fd(sock)] = 0;
 }