Merged revisions 140690 via svnmerge from
authorSteve Murphy <murf@digium.com>
Tue, 2 Sep 2008 22:55:12 +0000 (22:55 +0000)
committerSteve Murphy <murf@digium.com>
Tue, 2 Sep 2008 22:55:12 +0000 (22:55 +0000)
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.

........

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

main/channel.c

index 2596a00..017a812 100644 (file)
@@ -1362,7 +1362,7 @@ void ast_channel_free(struct ast_channel *chan)
        ast_jb_destroy(chan);
 
        if (chan->cdr) {
-               ast_cdr_free(chan->cdr);
+               ast_cdr_detach(chan->cdr);
                chan->cdr = NULL;
        }