Revision: 1930
http://undernet-ircu.svn.sourceforge.net/undernet-ircu/?rev=1930&view=rev
Author: entrope
Date: 2010-01-03 21:50:50 +0000 (Sun, 03 Jan 2010)
Log Message:
-----------
Fix SF bug #2852954 by removing the spurious assertion.
Modified Paths:
--------------
ircu2/branches/u2_10_12_branch/ChangeLog
ircu2/branches/u2_10_12_branch/ircd/engine_select.c
Modified: ircu2/branches/u2_10_12_branch/ChangeLog
===================================================================
--- ircu2/branches/u2_10_12_branch/ChangeLog 2010-01-03 21:20:56 UTC (rev
1929)
+++ ircu2/branches/u2_10_12_branch/ChangeLog 2010-01-03 21:50:50 UTC (rev
1930)
@@ -1,5 +1,12 @@
2010-01-03 Michael Poole <[email protected]>
+ * 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 <[email protected]>
+
* ircd/m_names.c (m_names): Terminate the buffer used for listing
clients who are not in any channel.
Modified: ircu2/branches/u2_10_12_branch/ircd/engine_select.c
===================================================================
--- ircu2/branches/u2_10_12_branch/ircd/engine_select.c 2010-01-03 21:20:56 UTC
(rev 1929)
+++ ircu2/branches/u2_10_12_branch/ircd/engine_select.c 2010-01-03 21:50:50 UTC
(rev 1930)
@@ -265,7 +265,7 @@
int nfds;
int i;
int errcode;
- size_t codesize;
+ socklen_t codesize;
struct Socket *sock;
while (running) {
@@ -403,8 +403,6 @@
break;
}
- assert(s_fd(sock) == i);
-
gen_ref_dec(sock); /* we're done with it */
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
