aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-02 23:32:51 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-02 23:32:51 +0000
commitcbe2b42e89d6f5c40a80778d66ff28c541b70257 (patch)
treec879c3105d6ccd31779c37ad3f8ed599d6fa5faa
parent17bfdb81f009eebcf49432867628f56d73d3f75f (diff)
Merged revisions 256010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r256010 | russell | 2010-04-02 18:30:58 -0500 (Fri, 02 Apr 2010) | 9 lines Merged revisions 256009 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r256009 | russell | 2010-04-02 18:30:15 -0500 (Fri, 02 Apr 2010) | 2 lines Remove extremely verbose debug message. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@256011 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/channel.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c
index 1d53263de..d9b0173c5 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3073,9 +3073,7 @@ done:
int ast_internal_timing_enabled(struct ast_channel *chan)
{
- int ret = ast_opt_internal_timing && chan->timingfd > -1;
- ast_debug(5, "Internal timing is %s (option_internal_timing=%d chan->timingfd=%d)\n", ret? "enabled": "disabled", ast_opt_internal_timing, chan->timingfd);
- return ret;
+ return (ast_opt_internal_timing && chan->timingfd > -1);
}
struct ast_frame *ast_read(struct ast_channel *chan)