[asterisk-commits] mmichelson: branch mmichelson/timeout_fixes r373944 - /team/mmichelson/timeou...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Sep 27 15:46:40 2012
New Revision: 373944

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373944
Log:
Remove unnecessary calculation from app_dial and app_queue.


Modified:
    team/mmichelson/timeout_fixes/apps/app_dial.c
    team/mmichelson/timeout_fixes/apps/app_queue.c

Modified: team/mmichelson/timeout_fixes/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/timeout_fixes/apps/app_dial.c?view=diff&rev=373944&r1=373943&r2=373944
==============================================================================
--- team/mmichelson/timeout_fixes/apps/app_dial.c (original)
+++ team/mmichelson/timeout_fixes/apps/app_dial.c Thu Sep 27 15:46:40 2012
@@ -1130,7 +1130,6 @@
 		}
 		*to = ast_remaining_ms(start, orig);
 		winner = ast_waitfor_n(watchers, pos, to);
-		*to = ast_remaining_ms(start, orig);
 		for (o = outgoing; o; o = o->next) {
 			struct ast_frame *f;
 			struct ast_channel *c = o->chan;

Modified: team/mmichelson/timeout_fixes/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/timeout_fixes/apps/app_queue.c?view=diff&rev=373944&r1=373943&r2=373944
==============================================================================
--- team/mmichelson/timeout_fixes/apps/app_queue.c (original)
+++ team/mmichelson/timeout_fixes/apps/app_queue.c Thu Sep 27 15:46:40 2012
@@ -3534,7 +3534,6 @@
 		/* Poll for events from both the incoming channel as well as any outgoing channels */
 		*to = ast_remaining_ms(start_time_tv, orig);
 		winner = ast_waitfor_n(watchers, pos, to);
-		*to = ast_remaining_ms(start_time_tv, orig);
 
 		/* Service all of the outgoing channels */
 		for (o = start; o; o = o->call_next) {