Fix SF bug #2852954 by removing the spurious assertion.

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

diff --git a/ChangeLog b/ChangeLog
index d6a54796d80b2d4471e9eaeef8b9aed3c36de8cd..11e18d3d7553a5b4268419a891a1f5b3abc6d0bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-03  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/engine_select.c (engine_loop): Remove a bogus assert() that
+       the structure's FD is correct after the event-handling callback
+       returns.  Also fix a warning about the type of the last parameter
+       passed to getsockopt().
+
 2010-01-03  Michael Poole <mdpoole@troilus.org>
 
        * ircd/m_names.c (m_names): Terminate the buffer used for listing

diff --git a/ircd/engine_select.c b/ircd/engine_select.c
index dbe9a3e4ddbde3b0e8f8c84574cc9d52073679aa..436f10baa1122b86007990d1c0fc922a919879e2 100644 (file)
--- a/ircd/engine_select.c
+++ b/ircd/engine_select.c
@@ -265,7 +265,7 @@ engine_loop(struct Generators* gen)
   int nfds;
   int i;
   int errcode;
-  size_t codesize;
+  socklen_t codesize;
   struct Socket *sock;
 
   while (running) {
@@ -403,8 +403,6 @@ engine_loop(struct Generators* gen)
        break;
       }
 
-      assert(s_fd(sock) == i);
-
       gen_ref_dec(sock); /* we're done with it */
     }