kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Luigi's suggestion to move the llfrom decl was a good one. Done.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-06-25 16:43:33 +00:00
parent 3f3a8af232
commit af42e2ca7b
1 changed files with 1 additions and 2 deletions
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)) { 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));