[asterisk-dev] [svn-commits] mmichelson: trunk r92976 - /trunk/funcs/func_timeout.c

[Russell Bryant]

SVN commits to the Digium repositories wrote:
> Author: mmichelson
> Date: Fri Dec 14 09:59:09 2007
> New Revision: 92976
> 
> URL: http://svn.digium.com/view/asterisk?view=rev&rev=92976
> Log:
> Reintroduce an optimization that was lost when converting trunk to use ast_verb.
> 
> 
> Modified:
>     trunk/funcs/func_timeout.c
> 
> Modified: trunk/funcs/func_timeout.c
> URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_timeout.c?view=diff&rev=92976&r1=92975&r2=92976
> ==============================================================================
> --- trunk/funcs/func_timeout.c (original)
> +++ trunk/funcs/func_timeout.c Fri Dec 14 09:59:09 2007
> @@ -106,14 +106,16 @@
>  	case 'a':
>  	case 'A':
>  		ast_channel_setwhentohangup(chan, x);
> +		if(option_verbose > 2) {
>  			if (chan->whentohangup) {
>  				struct timeval tv = { chan->whentohangup, 0 };
>  				ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S.%3q %Z",
>  					ast_localtime(&tv, &myt, NULL));
> -			ast_verb(3, "Channel will hangup at %s.\n", timestr);
> +				ast_verbose("Channel will hangup at %s.\n", timestr);
>  			} else {
> -			ast_verb(3, "Channel hangup cancelled.\n");
> +				ast_verbose("Channel hangup cancelled.\n");
>  			}
> +		}
>  		break;
>  
>  	case 'r':

Checking option_verbose directly is not the same thing as what ast_verb() does.
 ast_verb() does a bit more than that.  It checks the global verbose setting as
well as checks for a per-file setting of verbose for the current file.  This
change would break a file-specific setting of verbose for func_timeout.

Oh, and the coding guidelines say you're supposed to have a space after "if".  :)

-- 
Russell Bryant
Senior Software Engineer
Open Source Team Lead
Digium, Inc.