diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-02 23:36:53 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-02 23:36:53 +0000 |
commit | 7038ba7a34c0c80f0d47b2d3a7a93aa3afc15a1e (patch) | |
tree | a821266e654c3de6a04a0a5e9088255facbceee6 /main | |
parent | 83bf7214a2c8cc2685192147e350372b1608ca8f (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.2@256013 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/channel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c index a804a7529..e357fe3b8 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3093,9 +3093,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) |