[asterisk-commits] murf: branch 1.6.0 r140826 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Sep  3 09:16:02 2008
New Revision: 140826

URL: http://svn.digium.com/view/asterisk?view=rev&rev=140826
Log:
Merged revisions 140692 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r140692 | murf | 2008-09-02 16:55:12 -0600 (Tue, 02 Sep 2008) | 13 lines

Merged revisions 140690 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140690 | murf | 2008-09-02 16:40:13 -0600 (Tue, 02 Sep 2008) | 1 line

After reconsidering, with respect to 13409, ast_cdr_detach should be OK, better in fact, than ast_cdr_free, which generates lots of useless warnings that will undoubtably generate complaints.

Hmmm. It doesn't hush the useless warnings, but it does allow control of posting via the detach and post routines, for those possible situations,
where you'd want to post single-channel cdrs.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=140826&r1=140825&r2=140826
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Wed Sep  3 09:16:02 2008
@@ -1347,7 +1347,7 @@
 	ast_jb_destroy(chan);
 
 	if (chan->cdr) {
-		ast_cdr_free(chan->cdr);
+		ast_cdr_detach(chan->cdr);
 		chan->cdr = NULL;
 	}