kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 20:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 87069 via svnmerge from

Browse Source 
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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2007-10-25 23:11:28 +00:00
parent adc9003fc5
commit c6a8d45f43
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/linkedlists.h
View File

@@ -693,6 +693,9 @@ struct { \
\param list This is a pointer to the list to be appended. \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()) \param field This is the name of the field (declared using AST_LIST_ENTRY())
used to link entries of this list together. 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 { \ #define AST_LIST_APPEND_LIST(head, list, field) do { \
if (!(head)->first) { \ if (!(head)->first) { \
@@ -702,6 +705,8 @@ struct { \
(head)->last->field.next = (list)->first; \ (head)->last->field.next = (list)->first; \
(head)->last = (list)->last; \ (head)->last = (list)->last; \
} \ } \
(list)->first = NULL; \
(list)->last = NULL; \
} while (0) } while (0)
#define AST_RWLIST_APPEND_LIST AST_LIST_APPEND_LIST #define AST_RWLIST_APPEND_LIST AST_LIST_APPEND_LIST

1
main/channel.c
View File

@@ -3512,7 +3512,6 @@ static void clone_variables(struct ast_channel *original, struct ast_channel *cl
/* XXX Is this always correct? We have to in order to keep MACROS working XXX */ /* XXX Is this always correct? We have to in order to keep MACROS working XXX */
if (AST_LIST_FIRST(&clone->varshead)) if (AST_LIST_FIRST(&clone->varshead))
AST_LIST_APPEND_LIST(&original->varshead, &clone->varshead, entries); AST_LIST_APPEND_LIST(&original->varshead, &clone->varshead, entries);
AST_LIST_HEAD_INIT_NOLOCK(&clone->varshead);
/* then, dup the varshead list into the clone */ /* then, dup the varshead list into the clone */