diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-25 01:07:31 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-25 01:07:31 +0000 |
| commit | 75d9cbb9cbfee5cd735dc228abe63e2413e50620 (patch) | |
| tree | 5539cb4706ba8904dbd09105967b3245233da365 /main/cdr.c | |
| parent | 6cd06e4adbdcba5aeaed16612158166a148ea77c (diff) | |
Fix it so 1.4 actually compiles on my box.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@71422 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 a4a94a56e..487ece1e0 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -525,7 +525,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; @@ -540,7 +540,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)); |