diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-26 15:49:18 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-26 15:49:18 +0000 |
| commit | 4f3c4dc7f238b64a21172be86266311c9c645c77 (patch) | |
| tree | de4bd130dafa592858306d2ac6bcc5f85fd51cc8 /funcs | |
| parent | 07772bc9e3ef6636a3e99e07d2aea3a06988f0c9 (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: http://svn.digium.com/svn/asterisk/trunk@77299 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_odbc.c | 3 | ||||
| -rw-r--r-- | funcs/func_timeout.c | 15 |
2 files changed, 5 insertions, 13 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 2eac1eeb9..1c39326f8 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -324,8 +324,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { int res1 = -1; if (res == SQL_NO_DATA) { - if (option_verbose > 3) - ast_verbose(VERBOSE_PREFIX_4 "Found no rows [%s]\n", sql); + ast_verb(4, "Found no rows [%s]\n", sql); res1 = 0; ast_copy_string(rowcount, "0", sizeof(rowcount)); } else { 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; |