[svn-commits] russell: branch 1.6.0 r256011 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Apr  2 18:32:51 2010
New Revision: 256011

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=256011&r1=256010&r2=256011
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Fri Apr  2 18:32:51 2010
@@ -3073,9 +3073,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)