[svn-commits] mattf: branch 1.6.0 r115549 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Thu May  8 10:08:26 2008
New Revision: 115549

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115549
Log:
Merged revisions 115548 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r115548 | mattf | 2008-05-08 10:04:45 -0500 (Thu, 08 May 2008) | 1 line

Remove unused code as well as demote an error message to a debug message
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=115549&r1=115548&r2=115549
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Thu May  8 10:08:26 2008
@@ -9362,20 +9362,16 @@
 				res = ss7_read(ss7, pollers[i].fd);
 				ast_mutex_unlock(&linkset->lock);
 			}
+
 			if (pollers[i].revents & POLLOUT) {
 				ast_mutex_lock(&linkset->lock);
 				res = ss7_write(ss7, pollers[i].fd);
 				ast_mutex_unlock(&linkset->lock);
 				if (res < 0) {
-					ast_log(LOG_ERROR, "Error in write %s", strerror(errno));
-				}
-			}
-		}
-
-#if 0
-		if (res < 0)
-			exit(-1);
-#endif
+					ast_debug(1, "Error in write %s\n", strerror(errno));
+				}
+			}
+		}
 
 		while ((e = ss7_check_event(ss7))) {
 			switch (e->e) {