From: Russell Bryant Date: Fri, 2 Apr 2010 23:36:53 +0000 (+0000) Subject: Merged revisions 256010 via svnmerge from X-Git-Tag: 1.6.2.7-rc1~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=455aebd1bf93a9254170279ad79bae304a1aa0b8;p=thirdparty%2Fasterisk.git 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.2@256013 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/channel.c b/main/channel.c index a804a7529f..e357fe3b82 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)