diff options
| -rw-r--r-- | channel.c | 4 | ||||
| -rw-r--r-- | include/asterisk/linkedlists.h | 17 | ||||
| -rw-r--r-- | pbx.c | 4 |
3 files changed, 20 insertions, 5 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 */ diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index b91d11778..3ac3bffa7 100644 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -430,6 +430,23 @@ struct { \ } while (0) /*! + \brief Appends a whole list to the tail of a list. + \param head This is a pointer to the list head structure + \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. + */ +#define AST_LIST_APPEND_LIST(head, list, field) do { \ + if (!(head)->first) { \ + (head)->first = (list)->first; \ + (head)->last = (list)->last; \ + } else { \ + (head)->last->field.next = (list)->first; \ + (head)->last = (list)->last; \ + } \ +} while (0) + +/*! \brief Removes and returns the head entry from a list. \param head This is a pointer to the list head structure \param field This is the name of the field (declared using AST_LIST_ENTRY()) @@ -5906,9 +5906,7 @@ int pbx_builtin_serialize_variables(struct ast_channel *chan, char *buf, size_t memset(buf, 0, size); AST_LIST_TRAVERSE(&chan->varshead, variables, entries) { - if(variables && - (var=ast_var_name(variables)) && (val=ast_var_value(variables)) && - !ast_strlen_zero(var) && !ast_strlen_zero(val)) { + if ((var = ast_var_name(variables)) && (val = ast_var_value(variables))) { if (ast_build_string(&buf, &size, "%s=%s\n", var, val)) { ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n"); break; |