summaryrefslogtreecommitdiff
path: root/funcs/func_timeout.c
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-07-26 15:49:18 +0000
committerRussell Bryant <russell@russellbryant.com>2007-07-26 15:49:18 +0000
commitf8483a0d04f73e9d4c4f665efd5397cf96b17510 (patch)
treede4bd130dafa592858306d2ac6bcc5f85fd51cc8 /funcs/func_timeout.c
parent51e7035dfeca1def3070ca65f18153ee1d340ba9 (diff)
Do a massive conversion for using the ast_verb() macro
(closes issue #10277, patches by mvanbaak) Basically, this changes ... if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3, "Something\n"); to ... ast_verb(3, "Something\n"); git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_timeout.c')
-rw-r--r--funcs/func_timeout.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index ec730c819..51d2a47d9 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -111,26 +111,21 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data,
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_verbose(VERBOSE_PREFIX_3 "Channel will hangup at %s.\n",
- timestr);
+ ast_verb(3, "Channel will hangup at %s.\n", timestr);
} else {
- ast_verbose(VERBOSE_PREFIX_3 "Channel hangup cancelled.\n");
+ ast_verb(3, "Channel hangup cancelled.\n");
}
- }
break;
case 'r':
case 'R':
if (chan->pbx) {
chan->pbx->rtimeout = x;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Response timeout set to %d\n",
- chan->pbx->rtimeout);
+ ast_verb(3, "Response timeout set to %d\n", chan->pbx->rtimeout);
}
break;
@@ -138,9 +133,7 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data,
case 'D':
if (chan->pbx) {
chan->pbx->dtimeout = x;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Digit timeout set to %d\n",
- chan->pbx->dtimeout);
+ ast_verb(3, "Digit timeout set to %d\n", chan->pbx->dtimeout);
}
break;