[svn-commits] russell: trunk r88651 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Nov  5 11:52:08 2007
New Revision: 88651

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

........
r88624 | russell | 2007-11-05 11:46:02 -0600 (Mon, 05 Nov 2007) | 5 lines

Fix up datastore handling in ast_do_masquerade().  The code is intended to move
any channel datastores from the old channel to the new one.  However, it did
not use the linked list macros properly to accomplish the task.  The existing
code would only work if there was only a single datastore on the old channel.

........

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

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=88651&r1=88650&r2=88651
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Nov  5 11:52:08 2007
@@ -3688,8 +3688,7 @@
 
 	/* Move data stores over */
 	if (AST_LIST_FIRST(&clone->datastores))
-                AST_LIST_INSERT_TAIL(&original->datastores, AST_LIST_FIRST(&clone->datastores), entry);
-	AST_LIST_HEAD_INIT_NOLOCK(&clone->datastores);
+		AST_LIST_APPEND_LIST(&original->datastores, &clone->datastores, entry);
 
 	clone_variables(original, clone);
 	/* Presense of ADSI capable CPE follows clone */