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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@256011 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 1d53263de640b960c31bfa239c8cdeaba42c5daa..d9b0173c55615837e6e8e35e348688805a1d13ad 100644 (file)
--- 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)