aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-03 14:16:02 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-03 14:16:02 +0000
commitb468414524a6925527d7ce07d56ecfa8a631f168 (patch)
tree215a00f3c98d918ef86552e6c8fc629c65020a53 /main
parent1f81d7e41884c075e99927bad475d8d39581a5a9 (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.0@140826 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index 6d31bb19d..6133674cb 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1347,7 +1347,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;
}