[svn-commits] file: trunk r44171 - in /trunk: ./ main/io.c

[svn-commits at lists.digium.com]

Author: file
Date: Mon Oct  2 12:26:34 2006
New Revision: 44171

URL: http://svn.digium.com/view/asterisk?rev=44171&view=rev
Log:
Merged revisions 44169 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44169 | file | 2006-10-02 13:25:13 -0400 (Mon, 02 Oct 2006) | 10 lines

Merged revisions 44168 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44168 | file | 2006-10-02 13:22:27 -0400 (Mon, 02 Oct 2006) | 2 lines

Shrink when current_ioc is unused. It is set to -1 when unused, not 0. (issue #7941 reported by eclubb)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/io.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/io.c
URL: http://svn.digium.com/view/asterisk/trunk/main/io.c?rev=44171&r1=44170&r2=44171&view=diff
==============================================================================
--- trunk/main/io.c (original)
+++ trunk/main/io.c Mon Oct  2 12:26:34 2006
@@ -242,7 +242,7 @@
 			ioc->fds[x].events = 0;
 			ioc->fds[x].revents = 0;
 			ioc->needshrink = 1;
-			if (!ioc->current_ioc)
+			if (ioc->current_ioc == -1)
 				io_shrink(ioc);
 			return 0;
 		}