[asterisk-commits] file: trunk r71425 - in /trunk: ./ main/cdr.c

[SVN commits to the Asterisk project]

Author: file
Date: Sun Jun 24 20:08:22 2007
New Revision: 71425

URL: http://svn.digium.com/view/asterisk?view=rev&rev=71425
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/main/cdr.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cdr.c?view=diff&rev=71425&r1=71424&r2=71425
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Sun Jun 24 20:08:22 2007
@@ -528,7 +528,7 @@
 	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 @@
 		} 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));