diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-25 01:08:22 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-25 01:08:22 +0000 |
| commit | 53294d324309959b44c465581519a235eb9437ec (patch) | |
| tree | 4813b7a76c1e7868005a164239dcd1eeb5430cd8 /main/cdr.c | |
| parent | c05d3473b981280813230e21ac3bccc5691e5943 (diff) | |
Merged revisions 71422 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@71425 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/cdr.c b/main/cdr.c index ff8ec2642..8ca91e55f 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -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)); |