[svn-commits] russell: branch 1.6.2 r182592 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar 17 11:46:04 2009
New Revision: 182592

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

........
r182553 | russell | 2009-03-17 10:22:12 -0500 (Tue, 17 Mar 2009) | 5 lines

Tweak the handling of the frame list inside of ast_answer().

This does not change any behavior, but moves the frames from the local frame
list back to the channel read queue using an O(n) algorithm instead of O(n^2).

........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Tue Mar 17 11:46:04 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530
+/trunk:1-182359,182408,182450,182525,182530,182553

Modified: branches/1.6.2/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=182592&r1=182591&r2=182592
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Tue Mar 17 11:46:04 2009
@@ -1801,7 +1801,7 @@
 					ast_frfree(cur);
 				}
 
-				AST_LIST_INSERT_TAIL(&frames, new, frame_list);
+				AST_LIST_INSERT_HEAD(&frames, new, frame_list);
 
 				/* if a specific delay period was requested, continue
 				 * until that delay has passed. don't stop just because
@@ -1837,8 +1837,7 @@
 
 			if (res == 0) {
 				ast_channel_lock(chan);
-				while ((cur = AST_LIST_LAST(&frames))) {
-					AST_LIST_REMOVE(&frames, cur, frame_list);
+				while ((cur = AST_LIST_REMOVE_HEAD(&frames, frame_list))) {
 					ast_queue_frame_head(chan, cur);
 					ast_frfree(cur);
 				}