dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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:
murf 2007-06-25 16:43:33 +00:00
parent 7b0a8a9e73
commit 65df373635
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/cdr.c
View File

@ -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)) {
struct ast_cdr *llfrom = NULL;
discard_from = 1;
if (lto) {
struct ast_cdr *llfrom = NULL;
/* insert the from stuff after lto */
lto->next = from;
lfrom = from;
@ -543,7 +543,6 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
} else {
/* save copy of the current *to cdr */
struct ast_cdr tcdr;
struct ast_cdr *llfrom = NULL;
memcpy(&tcdr, to, sizeof(tcdr));
/* copy in the locked from cdr */
memcpy(to, from, sizeof(*to));