[asterisk-commits] kpfleming: trunk r87070 - in /trunk: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Oct 25 18:11:28 2007
New Revision: 87070

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

........
r87069 | kpfleming | 2007-10-25 18:03:11 -0500 (Thu, 25 Oct 2007) | 2 lines

appending one list to another should leave the first list empty, and not require the user to do that

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/linkedlists.h
    trunk/main/channel.c

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

Modified: trunk/include/asterisk/linkedlists.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/linkedlists.h?view=diff&rev=87070&r1=87069&r2=87070
==============================================================================
--- trunk/include/asterisk/linkedlists.h (original)
+++ trunk/include/asterisk/linkedlists.h Thu Oct 25 18:11:28 2007
@@ -693,6 +693,9 @@
   \param list This is a pointer to the list to be appended.
   \param field This is the name of the field (declared using AST_LIST_ENTRY())
   used to link entries of this list together.
+
+  Note: The source list (the \a list parameter) will be empty after
+  calling this macro (the list entries are \b moved to the target list).
  */
 #define AST_LIST_APPEND_LIST(head, list, field) do {			\
       if (!(head)->first) {						\
@@ -702,6 +705,8 @@
 		(head)->last->field.next = (list)->first;		\
 		(head)->last = (list)->last;				\
       }									\
+      (list)->first = NULL;						\
+      (list)->last = NULL;						\
 } while (0)
 
 #define AST_RWLIST_APPEND_LIST AST_LIST_APPEND_LIST

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=87070&r1=87069&r2=87070
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Oct 25 18:11:28 2007
@@ -3512,7 +3512,6 @@
 	/* XXX Is this always correct?  We have to in order to keep MACROS working XXX */
 	if (AST_LIST_FIRST(&clone->varshead))
 		AST_LIST_APPEND_LIST(&original->varshead, &clone->varshead, entries);
-	AST_LIST_HEAD_INIT_NOLOCK(&clone->varshead);
 
 	/* then, dup the varshead list into the clone */