aboutsummaryrefslogtreecommitdiffstats
path: root/main/channel.c
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-02 23:01:35 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-02 23:01:35 +0000
commit6c7c43aed43e6f0927e165656e9346521f368bb4 (patch)
tree09a0ff97743b3081d12db380ee4923e186fa5e2e /main/channel.c
parent0ff1c9603b5323b3c7ee669f923f547c9ceef0aa (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@140695 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
-rw-r--r--main/channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index 2596a0037..017a812c4 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;
}