diff options
| author | Steve Murphy <murf@digium.com> | 2007-06-25 16:43:33 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-06-25 16:43:33 +0000 |
| commit | af42e2ca7bb1d31573ac692d5c5ae1757b750e42 (patch) | |
| tree | 91ba02f25e92ffc0642614ce28000d90c1ee602e /main/cdr.c | |
| parent | 3f3a8af232e7297b52e33fb5b03c1a735721f592 (diff) | |
Luigi's suggestion to move the llfrom decl was a good one. Done.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/cdr.c b/main/cdr.c index 8ca91e55f..90e2da67e 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -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)); |