Luigi's suggestion to move the llfrom decl was a good one. Done.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@71637 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
7b0a8a9e73
commit
65df373635
1 changed files with 1 additions and 2 deletions
|
@ -526,9 +526,9 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ast_test_flag(from, AST_CDR_FLAG_LOCKED)) {
|
if (ast_test_flag(from, AST_CDR_FLAG_LOCKED)) {
|
||||||
|
struct ast_cdr *llfrom = NULL;
|
||||||
discard_from = 1;
|
discard_from = 1;
|
||||||
if (lto) {
|
if (lto) {
|
||||||
struct ast_cdr *llfrom = NULL;
|
|
||||||
/* insert the from stuff after lto */
|
/* insert the from stuff after lto */
|
||||||
lto->next = from;
|
lto->next = from;
|
||||||
lfrom = from;
|
lfrom = from;
|
||||||
|
@ -543,7 +543,6 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
|
||||||
} else {
|
} else {
|
||||||
/* save copy of the current *to cdr */
|
/* save copy of the current *to cdr */
|
||||||
struct ast_cdr tcdr;
|
struct ast_cdr tcdr;
|
||||||
struct ast_cdr *llfrom = NULL;
|
|
||||||
memcpy(&tcdr, to, sizeof(tcdr));
|
memcpy(&tcdr, to, sizeof(tcdr));
|
||||||
/* copy in the locked from cdr */
|
/* copy in the locked from cdr */
|
||||||
memcpy(to, from, sizeof(*to));
|
memcpy(to, from, sizeof(*to));
|
||||||
|
|
Reference in a new issue