Luigi's suggestion to move the llfrom decl was a good one. Done.
authorSteve Murphy <murf@digium.com>
Mon, 25 Jun 2007 16:43:33 +0000 (16:43 +0000)
committerSteve Murphy <murf@digium.com>
Mon, 25 Jun 2007 16:43:33 +0000 (16:43 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71637 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/cdr.c

index 8ca91e5..90e2da6 100644 (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));