diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-24 20:01:23 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-24 20:01:23 +0000 |
commit | 42e2c2da3db6cba2780b125f5f1ad567d3e4b8e3 (patch) | |
tree | 1a07875474d132cdc875278414ee14d3023208b3 /channel.c | |
parent | ff681681c9833b48b97386e4088407f7359a5b1f (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2891,7 +2891,7 @@ static void clone_variables(struct ast_channel *original, struct ast_channel *cl AST_LIST_TRAVERSE_SAFE_BEGIN(&original->varshead, varptr, entries) { if (!strncmp(ast_var_name(varptr), GROUP_CATEGORY_PREFIX, strlen(GROUP_CATEGORY_PREFIX))) { - AST_LIST_REMOVE(&original->varshead, varptr, entries); + AST_LIST_REMOVE_CURRENT(&original->varshead, entries); ast_var_delete(varptr); } } @@ -2900,7 +2900,7 @@ static void clone_variables(struct ast_channel *original, struct ast_channel *cl /* Append variables from clone channel into original channel */ /* XXX Is this always correct? We have to in order to keep MACROS working XXX */ if (AST_LIST_FIRST(&clone->varshead)) - AST_LIST_INSERT_TAIL(&original->varshead, AST_LIST_FIRST(&clone->varshead), entries); + AST_LIST_APPEND_LIST(&original->varshead, &clone->varshead, entries); } /*--- ast_do_masquerade: Masquerade a channel */ |