diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-25 16:43:33 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-25 16:43:33 +0000 |
| commit | 65df373635c455a9dce3f88a00bffc427ea132b6 (patch) | |
| tree | 91ba02f25e92ffc0642614ce28000d90c1ee602e /main/cdr.c | |
| parent | 7b0a8a9e73b8c64efc2f36219dd11f7530b23a3e (diff) | |
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
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)); |