Merged revisions 71422 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 25 Jun 2007 01:08:22 +0000 (01:08 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 25 Jun 2007 01:08:22 +0000 (01:08 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r71422 | file | 2007-06-24 21:07:31 -0400 (Sun, 24 Jun 2007) | 2 lines

Fix it so 1.4 actually compiles on my box.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71425 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/cdr.c

index ff8ec26..8ca91e5 100644 (file)
@@ -528,7 +528,7 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
        if (ast_test_flag(from, AST_CDR_FLAG_LOCKED)) {
                discard_from = 1;
                if (lto) {
-                       struct ast_cdr *llfrom;
+                       struct ast_cdr *llfrom = NULL;
                        /* insert the from stuff after lto */
                        lto->next = from;
                        lfrom = from;
@@ -543,7 +543,7 @@ 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;
+                       struct ast_cdr *llfrom = NULL;
                        memcpy(&tcdr, to, sizeof(tcdr));
                        /* copy in the locked from cdr */
                        memcpy(to, from, sizeof(*to));