From 01586bad04d3de9641d7632910ae89352f38f02d Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Sun, 3 Jan 2010 21:50:50 +0000 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ ircd/engine_select.c | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6a5479..11e18d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-03 Michael Poole + + * 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 * 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 dbe9a3e..436f10b 100644 --- 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 */ } -- 2.20.1