From 08146f95bc4e2df96ad2012ee899963c1826b40b Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Tue, 2 Sep 2008 23:01:35 +0000 Subject: [PATCH] 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. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140695 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/channel.c b/main/channel.c index 2596a0037a..017a812c4f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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; }