[asterisk-commits] russell: trunk r256010 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Apr  2 18:30:58 2010
New Revision: 256010

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=256010
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=256010&r1=256009&r2=256010
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Apr  2 18:30:58 2010
@@ -3570,9 +3570,7 @@
 
 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)