Author: russell
Date: Thu Jul 26 10:49:18 2007
New Revision: 77299
URL: http://svn.digium.com/view/asterisk?view=rev&rev=77299
Log:
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");
Modified:
trunk/apps/app_adsiprog.c
trunk/apps/app_alarmreceiver.c
trunk/apps/app_amd.c
trunk/apps/app_chanspy.c
trunk/apps/app_db.c
trunk/apps/app_dial.c
trunk/apps/app_flash.c
trunk/apps/app_followme.c
trunk/apps/app_getcpeid.c
trunk/apps/app_macro.c
trunk/apps/app_meetme.c
trunk/apps/app_parkandannounce.c
trunk/apps/app_queue.c
trunk/apps/app_read.c
trunk/apps/app_rpt.c
trunk/apps/app_sms.c
trunk/apps/app_voicemail.c
trunk/apps/app_waitforring.c
trunk/apps/app_waitforsilence.c
trunk/apps/app_while.c
trunk/apps/app_zapras.c
trunk/apps/app_zapscan.c
trunk/cdr/cdr_adaptive_odbc.c
trunk/cdr/cdr_odbc.c
trunk/channels/chan_agent.c
trunk/channels/chan_alsa.c
trunk/channels/chan_h323.c
trunk/channels/chan_iax2.c
trunk/channels/chan_mgcp.c
trunk/channels/chan_misdn.c
trunk/channels/chan_oss.c
trunk/channels/chan_phone.c
trunk/channels/chan_sip.c
trunk/channels/chan_skinny.c
trunk/channels/chan_vpb.cc
trunk/channels/chan_zap.c
trunk/channels/iax2-provision.c
trunk/codecs/codec_adpcm.c
trunk/codecs/codec_alaw.c
trunk/codecs/codec_g722.c
trunk/codecs/codec_g726.c
trunk/codecs/codec_gsm.c
trunk/codecs/codec_lpc10.c
trunk/codecs/codec_speex.c
trunk/codecs/codec_ulaw.c
trunk/codecs/codec_zap.c
trunk/funcs/func_odbc.c
trunk/funcs/func_timeout.c
trunk/main/abstract_jb.c
trunk/main/app.c
trunk/main/cdr.c
trunk/main/channel.c
trunk/main/config.c
trunk/main/dial.c
trunk/main/dnsmgr.c
trunk/main/file.c
trunk/main/image.c
trunk/main/indications.c
trunk/main/loader.c
trunk/main/manager.c
trunk/main/rtp.c
trunk/main/say.c
trunk/main/srv.c
trunk/main/translate.c
trunk/main/udptl.c
trunk/pbx/pbx_dundi.c
trunk/pbx/pbx_gtkconsole.c
trunk/pbx/pbx_realtime.c
trunk/pbx/pbx_spool.c
trunk/res/res_agi.c
trunk/res/res_config_odbc.c
trunk/res/res_config_pgsql.c
trunk/res/res_crypto.c
trunk/res/res_features.c
trunk/res/res_jabber.c
trunk/res/res_musiconhold.c
trunk/res/res_smdi.c
trunk/res/res_snmp.c
trunk/res/res_speech.c
Modified: trunk/apps/app_adsiprog.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_adsiprog.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_adsiprog.c (original)
+++ trunk/apps/app_adsiprog.c Thu Jul 26 10:49:18 2007
@@ -1448,8 +1448,7 @@
/* Now begin the download attempt */
if (ast_adsi_begin_download(chan, scr->desc, scr->fdn, scr->sec,
scr->ver)) {
/* User rejected us for some reason */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "User rejected download
attempt\n");
+ ast_verb(3, "User rejected download attempt\n");
ast_log(LOG_NOTICE, "User rejected download on channel %s\n",
chan->name);
ast_free(scr);
return -1;
@@ -1535,8 +1534,7 @@
return -1;
if (ast_adsi_end_download(chan)) {
/* Download failed for some reason */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Download attempt
failed\n");
+ ast_verb(3, "Download attempt failed\n");
ast_log(LOG_NOTICE, "Download failed on %s\n", chan->name);
ast_free(scr);
return -1;
@@ -1554,11 +1552,9 @@
data = "asterisk.adsi";
if (!ast_adsi_available(chan)) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "ADSI Unavailable on CPE.
Not bothering to try.\n");
+ ast_verb(3, "ADSI Unavailable on CPE. Not bothering to
try.\n");
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "ADSI Available on CPE.
Attempting Upload.\n");
+ ast_verb(3, "ADSI Available on CPE. Attempting Upload.\n");
res = adsi_prog(chan, data);
}
Modified: trunk/apps/app_alarmreceiver.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_alarmreceiver.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_alarmreceiver.c (original)
+++ trunk/apps/app_alarmreceiver.c Thu Jul 26 10:49:18 2007
@@ -118,8 +118,7 @@
res = ast_db_get(db_family, key, value, sizeof(value) - 1);
if(res){
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Creating
database entry %s and setting to 1\n", key);
+ ast_verb(4, "AlarmReceiver: Creating database entry %s and
setting to 1\n", key);
/* Guess we have to create it */
res = ast_db_put(db_family, key, "1");
return;
@@ -210,8 +209,7 @@
break;
}
if (ast_write(chan, &wf)){
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4
"AlarmReceiver: Failed to write frame on %s\n", chan->name);
+ ast_verb(4, "AlarmReceiver: Failed to write
frame on %s\n", chan->name);
ast_log(LOG_WARNING, "AlarmReceiver Failed to
write frame on %s\n",chan->name);
res = -1;
ast_frfree(f);
@@ -523,8 +521,7 @@
got_some_digits = 1;
- if (option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Received
Event %s\n", event);
+ ast_verb(2, "AlarmReceiver: Received Event %s\n", event);
ast_debug(1, "AlarmReceiver: Received event: %s\n", event);
/* Calculate checksum */
@@ -542,8 +539,7 @@
}
if(i == 16){
- if(option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver:
Bad DTMF character %c, trying again\n", event[j]);
+ ast_verb(2, "AlarmReceiver: Bad DTMF character %c,
trying again\n", event[j]);
continue; /* Bad character */
}
@@ -553,8 +549,7 @@
if (checksum) {
database_increment("checksum-errors");
- if (option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver:
Nonzero checksum\n");
+ ast_verb(2, "AlarmReceiver: Nonzero checksum\n");
ast_debug(1, "AlarmReceiver: Nonzero checksum\n");
continue;
}
@@ -564,8 +559,7 @@
if(strncmp(event + 4, "18", 2)){
if(strncmp(event + 4, "98", 2)){
database_increment("format-errors");
- if(option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2
"AlarmReceiver: Wrong message type\n");
+ ast_verb(2, "AlarmReceiver: Wrong message
type\n");
ast_debug(1, "AlarmReceiver: Wrong message
type\n");
continue;
}
@@ -635,8 +629,7 @@
/* Set write and read formats to ULAW */
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Setting read and
write formats to ULAW\n");
+ ast_verb(4, "AlarmReceiver: Setting read and write formats to ULAW\n");
if (ast_set_write_format(chan,AST_FORMAT_ULAW)){
ast_log(LOG_WARNING, "AlarmReceiver: Unable to set write format
to Mu-law on %s\n",chan->name);
@@ -655,8 +648,7 @@
/* Answer the channel if it is not already */
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Answering
channel\n");
+ ast_verb(4, "AlarmReceiver: Answering channel\n");
if (chan->_state != AST_STATE_UP) {
if ((res = ast_answer(chan)))
@@ -665,8 +657,7 @@
/* Wait for the connection to settle post-answer */
- if(option_verbose >= 4)
- ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Waiting for
connection to stabilize\n");
+ ast_verb(4, "AlarmReceiver: Waiting for connection to stabilize\n");
res = ast_safe_sleep(chan, 1250);
Modified: trunk/apps/app_amd.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_amd.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_amd.c (original)
+++ trunk/apps/app_amd.c Thu Jul 26 10:49:18 2007
@@ -136,8 +136,7 @@
AST_APP_ARG(argSilenceThreshold);
);
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD: %s %s %s (Fmt: %d)\n",
chan->name ,chan->cid.cid_ani, chan->cid.cid_rdnis, chan->readformat);
+ ast_verb(3, "AMD: %s %s %s (Fmt: %d)\n", chan->name ,chan->cid.cid_ani,
chan->cid.cid_rdnis, chan->readformat);
/* Lets parse the arguments. */
if (!ast_strlen_zero(parse)) {
@@ -164,8 +163,7 @@
}
/* Now we're ready to roll! */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD: initialSilence [%d] greeting
[%d] afterGreetingSilence [%d] "
+ ast_verb(3, "AMD: initialSilence [%d] greeting [%d]
afterGreetingSilence [%d] "
"totalAnalysisTime [%d] minimumWordLength [%d]
betweenWordsSilence [%d] maximumNumberOfWords [%d] silenceThreshold [%d] \n",
initialSilence, greeting, afterGreetingSilence,
totalAnalysisTime,
minimumWordLength, betweenWordsSilence,
maximumNumberOfWords, silenceThreshold );
@@ -194,8 +192,7 @@
while ((res = ast_waitfor(chan, totalAnalysisTime)) > -1) {
/* If we fail to read in a frame, that means they hung up */
if (!(f = ast_read(chan))) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
+ ast_verb(3, "AMD: HANGUP\n");
ast_debug(1, "Got hangup\n");
strcpy(amdStatus, "HANGUP");
break;
@@ -241,8 +238,7 @@
}
if (silenceDuration >= afterGreetingSilence &&
inGreeting == 1) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"AMD: HUMAN: silenceDuration:%d afterGreetingSilence:%d\n",
+ ast_verb(3, "AMD: HUMAN:
silenceDuration:%d afterGreetingSilence:%d\n",
silenceDuration,
afterGreetingSilence);
ast_frfree(f);
strcpy(amdStatus , "HUMAN");
@@ -274,8 +270,7 @@
}
if (inGreeting == 1 && voiceDuration >=
greeting) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"AMD: ANSWERING MACHINE: voiceDuration:%d greeting:%d\n", voiceDuration,
greeting);
+ ast_verb(3, "AMD: ANSWERING MACHINE:
voiceDuration:%d greeting:%d\n", voiceDuration, greeting);
ast_frfree(f);
strcpy(amdStatus , "MACHINE");
sprintf(amdCause ,
"LONGGREETING-%d-%d", voiceDuration, greeting);
@@ -295,8 +290,7 @@
if (!res) {
/* It took too long to get a frame back. Giving up. */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD: Channel [%s]. Too
long...\n", chan->name);
+ ast_verb(3, "AMD: Channel [%s]. Too long...\n", chan->name);
strcpy(amdStatus , "NOTSURE");
sprintf(amdCause , "TOOLONG-%d", iTotalTime);
}
@@ -368,8 +362,7 @@
ast_config_destroy(cfg);
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD defaults: initialSilence [%d]
greeting [%d] afterGreetingSilence [%d] "
+ ast_verb(3, "AMD defaults: initialSilence [%d] greeting [%d]
afterGreetingSilence [%d] "
"totalAnalysisTime [%d] minimumWordLength [%d]
betweenWordsSilence [%d] maximumNumberOfWords [%d] silenceThreshold [%d] \n",
dfltInitialSilence, dfltGreeting,
dfltAfterGreetingSilence, dfltTotalAnalysisTime,
dfltMinimumWordLength, dfltBetweenWordsSilence,
dfltMaximumNumberOfWords, dfltSilenceThreshold );
Modified: trunk/apps/app_chanspy.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_chanspy.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_chanspy.c (original)
+++ trunk/apps/app_chanspy.c Thu Jul 26 10:49:18 2007
@@ -277,8 +277,7 @@
return 0;
name = ast_strdupa(spyee->name);
- if (option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "Spying on channel %s\n", name);
+ ast_verb(2, "Spying on channel %s\n", name);
memset(&csth, 0, sizeof(csth));
ast_set_flag(&csth.spy, CHANSPY_FORMAT_AUDIO);
@@ -401,8 +400,7 @@
(*volfactor)++;
if (*volfactor > 4)
*volfactor = -4;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Setting spy
volume on %s to %d\n", chan->name, *volfactor);
+ ast_verb(3, "Setting spy volume on %s to %d\n",
chan->name, *volfactor);
csth.volfactor = *volfactor;
set_volume(chan, &csth);
if (csth.volfactor) {
Modified: trunk/apps/app_db.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_db.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_db.c (original)
+++ trunk/apps/app_db.c Thu Jul 26 10:49:18 2007
@@ -85,17 +85,13 @@
keytree = 0;
}
- if (option_verbose > 2) {
if (keytree)
- ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: family=%s,
keytree=%s\n", family, keytree);
+ ast_verb(3, "DBdeltree: family=%s, keytree=%s\n", family,
keytree);
else
- ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: family=%s\n",
family);
- }
+ ast_verb(3, "DBdeltree: family=%s\n", family);
- if (ast_db_deltree(family, keytree)) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: Error deleting
key from database.\n");
- }
+ if (ast_db_deltree(family, keytree))
+ ast_verb(3, "DBdeltree: Error deleting key from database.\n");
return 0;
}
@@ -119,12 +115,9 @@
ast_debug(1, "Ignoring; Syntax error in argument\n");
return 0;
}
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "DBdel: family=%s,
key=%s\n", family, key);
- if (ast_db_del(family, key)) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "DBdel: Error
deleting key from database.\n");
- }
+ ast_verb(3, "DBdel: family=%s, key=%s\n", family, key);
+ if (ast_db_del(family, key))
+ ast_verb(3, "DBdel: Error deleting key from
database.\n");
} else {
ast_debug(1, "Ignoring, no parameters\n");
}
Modified: trunk/apps/app_dial.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Thu Jul 26 10:49:18 2007
@@ -474,12 +474,10 @@
/* Before processing channel, go ahead and check for forwarding */
o->forwards++;
if (o->forwards < AST_MAX_FORWARDS) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Now forwarding %s to
'%s/%s' (thanks to %s)\n", in->name, tech, stuff, c->name);
+ ast_verb(3, "Now forwarding %s to '%s/%s' (thanks to %s)\n",
in->name, tech, stuff, c->name);
/* If we have been told to ignore forwards, just set this
channel to null and continue processing extensions normally */
if (ast_test_flag64(peerflags, OPT_IGNORE_FORWARDING)) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to
'%s/%s' prevented.\n", in->name, tech, stuff);
+ ast_verb(3, "Forwarding %s to '%s/%s' prevented.\n",
in->name, tech, stuff);
c = o->chan = NULL;
cause = AST_CAUSE_BUSY;
} else {
@@ -493,8 +491,7 @@
ast_log(LOG_NOTICE, "Unable to create local
channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
}
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from
%s\n", c->name);
+ ast_verb(3, "Too many forwards from %s\n", c->name);
cause = AST_CAUSE_CONGESTION;
c = o->chan = NULL;
}
@@ -588,8 +585,7 @@
}
if (pos == 1) { /* only the input channel is available */
if (numlines == (num.busy + num.congestion +
num.nochan)) {
- if (option_verbose > 2)
- ast_verbose( VERBOSE_PREFIX_2 "Everyone
is busy/congested at this time (%d:%d/%d/%d)\n", numlines, num.busy,
num.congestion, num.nochan);
+ ast_verb(2, "Everyone is busy/congested at this
time (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
if (num.busy)
strcpy(pa->status, "BUSY");
else if (num.congestion)
@@ -597,8 +593,7 @@
else if (num.nochan)
strcpy(pa->status, "CHANUNAVAIL");
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "No one is
available to answer at this time (%d:%d/%d/%d)\n", numlines, num.busy,
num.congestion, num.nochan);
+ ast_verb(3, "No one is available to answer at
this time (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
}
*to = 0;
return NULL;
@@ -612,8 +607,7 @@
continue;
if (ast_test_flag64(o, DIAL_STILLGOING) && c->_state ==
AST_STATE_UP) {
if (!peer) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"%s answered %s\n", c->name, in->name);
+ ast_verb(3, "%s answered %s\n",
c->name, in->name);
peer = c;
ast_copy_flags64(peerflags, o,
OPT_CALLEE_TRANSFER |
OPT_CALLER_TRANSFER |
@@ -647,8 +641,7 @@
case AST_CONTROL_ANSWER:
/* This is our guy if someone answered.
*/
if (!peer) {
- if (option_verbose > 2)
- ast_verbose(
VERBOSE_PREFIX_3 "%s answered %s\n", c->name, in->name);
+ ast_verb(3, "%s answered %s\n",
c->name, in->name);
peer = c;
ast_copy_flags64(peerflags, o,
OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
@@ -666,8 +659,7 @@
c->hangupcause =
AST_CAUSE_NORMAL_CLEARING;
break;
case AST_CONTROL_BUSY:
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"%s is busy\n", c->name);
+ ast_verb(3, "%s is busy\n", c->name);
in->hangupcause = c->hangupcause;
ast_hangup(c);
c = o->chan = NULL;
@@ -675,8 +667,7 @@
handle_cause(AST_CAUSE_BUSY, &num);
break;
case AST_CONTROL_CONGESTION:
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"%s is circuit-busy\n", c->name);
+ ast_verb(3, "%s is circuit-busy\n",
c->name);
in->hangupcause = c->hangupcause;
ast_hangup(c);
c = o->chan = NULL;
@@ -684,8 +675,7 @@
handle_cause(AST_CAUSE_CONGESTION,
&num);
break;
case AST_CONTROL_RINGING:
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"%s is ringing\n", c->name);
+ ast_verb(3, "%s is ringing\n", c->name);
/* Setup early media if appropriate */
if (single)
ast_channel_early_bridge(in, c);
@@ -695,8 +685,7 @@
}
break;
case AST_CONTROL_PROGRESS:
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
"%s is making progress passing it to %s\n", c->name, in->name);
+ ast_verb(3, "%s is making progress
passing it to %s\n", c->name, in->name);
/* Setup early media if appropriate */
if (single)
ast_channel_early_bridge(in, c);
@@ -704,26 +693,22 @@
ast_indicate(in,
AST_CONTROL_PROGRESS);
break;
case AST_CONTROL_VIDUPDATE:
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
"%s requested a video update, passing it to %s\n", c->name, in->name);
+ ast_verb(3, "%s requested a video
update, passing it to %s\n", c->name, in->name);
ast_indicate(in, AST_CONTROL_VIDUPDATE);
break;
case AST_CONTROL_PROCEEDING:
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3
"%s is proceeding passing it to %s\n", c->name, in->name);
+ ast_verb(3, "%s is proceeding passing
it to %s\n", c->name, in->name);
if (single)
ast_channel_early_bridge(in, c);
if (!ast_test_flag64(outgoing,
OPT_RINGBACK))
ast_indicate(in,
AST_CONTROL_PROCEEDING);
break;
case AST_CONTROL_HOLD:
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"Call on %s placed on hold\n", c->name);
+ ast_verb(3, "Call on %s placed on
hold\n", c->name);
ast_indicate(in, AST_CONTROL_HOLD);
break;
case AST_CONTROL_UNHOLD:
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"Call on %s left from hold\n", c->name);
+ ast_verb(3, "Call on %s left from
hold\n", c->name);
ast_indicate(in, AST_CONTROL_UNHOLD);
break;
case AST_CONTROL_OFFHOOK:
@@ -732,8 +717,7 @@
break;
case -1:
if (!ast_test_flag64(outgoing,
OPT_RINGBACK | OPT_MUSICBACK)) {
- if (option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "%s stopped sounds\n", c->name);
+ ast_verb(3, "%s stopped
sounds\n", c->name);
ast_indicate(in, -1);
pa->sentringing = 0;
}
@@ -782,8 +766,7 @@
if (ast_test_flag64(peerflags, OPT_DTMF_EXIT)) {
const char *context =
pbx_builtin_getvar_helper(in, "EXITCONTEXT");
if (onedigit_goto(in, context, (char)
f->subclass, 1)) {
- if (option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "User hit %c to disconnect call.\n", f->subclass);
+ ast_verb(3, "User hit %c to
disconnect call.\n", f->subclass);
*to=0;
ast_cdr_noanswer(in->cdr);
*result = f->subclass;
@@ -795,8 +778,7 @@
if (ast_test_flag64(peerflags,
OPT_CALLER_HANGUP) &&
(f->subclass == '*')) { /*
hmm it it not guaranteed to be '*' anymore. */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"User hit %c to disconnect call.\n", f->subclass);
+ ast_verb(3, "User hit %c to disconnect
call.\n", f->subclass);
*to=0;
strcpy(pa->status, "CANCEL");
ast_cdr_noanswer(in->cdr);
@@ -819,14 +801,13 @@
((f->subclass == AST_CONTROL_HOLD) ||
(f->subclass == AST_CONTROL_UNHOLD) ||
(f->subclass == AST_CONTROL_VIDUPDATE))) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "%s
requested special control %d, passing it to %s\n", in->name, f->subclass,
outgoing->chan->name);
+ ast_verb(3, "%s requested special control %d,
passing it to %s\n", in->name, f->subclass, outgoing->chan->name);
ast_indicate_data(outgoing->chan, f->subclass,
f->data, f->datalen);
}
ast_frfree(f);
}
- if (!*to && (option_verbose > 2))
- ast_verbose(VERBOSE_PREFIX_3 "Nobody picked up in %d
ms\n", orig);
+ if (!*to)
+ ast_verb(3, "Nobody picked up in %d ms\n", orig);
if (!*to || ast_check_hangup(in)) {
ast_cdr_noanswer(in->cdr);
}
@@ -931,21 +912,20 @@
/* more efficient to do it like S(x) does since no advanced opts */
if (!config->play_warning && !config->start_sound && !config->end_sound
&& config->timelimit) {
*calldurationlimit = config->timelimit / 1000;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Setting call duration
limit to %d seconds.\n",
+ ast_verb(3, "Setting call duration limit to %d seconds.\n",
*calldurationlimit);
config->timelimit = play_to_caller = play_to_callee =
config->play_warning = config->warning_freq = 0;
- } else if (option_verbose > 2) {
- ast_verbose(VERBOSE_PREFIX_3 "Limit Data for this call:\n");
- ast_verbose(VERBOSE_PREFIX_4 "timelimit = %ld\n",
config->timelimit);
- ast_verbose(VERBOSE_PREFIX_4 "play_warning = %ld\n",
config->play_warning);
- ast_verbose(VERBOSE_PREFIX_4 "play_to_caller = %s\n",
play_to_caller ? "yes" : "no");
- ast_verbose(VERBOSE_PREFIX_4 "play_to_callee = %s\n",
play_to_callee ? "yes" : "no");
- ast_verbose(VERBOSE_PREFIX_4 "warning_freq = %ld\n",
config->warning_freq);
- ast_verbose(VERBOSE_PREFIX_4 "start_sound = %s\n",
S_OR(config->start_sound, ""));
- ast_verbose(VERBOSE_PREFIX_4 "warning_sound = %s\n",
config->warning_sound);
- ast_verbose(VERBOSE_PREFIX_4 "end_sound = %s\n",
S_OR(config->end_sound, ""));
+ } else {
+ ast_verb(3, "Limit Data for this call:\n");
+ ast_verb(4, "timelimit = %ld\n", config->timelimit);
+ ast_verb(4, "play_warning = %ld\n", config->play_warning);
+ ast_verb(4, "play_to_caller = %s\n", play_to_caller ? "yes" :
"no");
+ ast_verb(4, "play_to_callee = %s\n", play_to_callee ? "yes" :
"no");
+ ast_verb(4, "warning_freq = %ld\n", config->warning_freq);
+ ast_verb(4, "start_sound = %s\n", S_OR(config->start_sound,
""));
+ ast_verb(4, "warning_sound = %s\n", config->warning_sound);
+ ast_verb(4, "end_sound = %s\n", S_OR(config->end_sound,
""));
}
if (play_to_caller)
ast_set_flag(&(config->features_caller),
AST_FEATURE_PLAY_WARNING);
@@ -1039,8 +1019,7 @@
static const char *_val[] = { "ALLOW", "DENY", "TORTURE",
"KILL", "ALLOW" };
static const int _flag[] = { AST_PRIVACY_ALLOW,
AST_PRIVACY_DENY, AST_PRIVACY_TORTURE, AST_PRIVACY_KILL, AST_PRIVACY_ALLOW};
int i = res2 - '1';
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "--Set privacy database
entry %s/%s to %s\n",
+ ast_verb(3, "--Set privacy database entry %s/%s to %s\n",
opt_args[OPT_ARG_PRIVACY],
pa->privcid, _val[i]);
ast_privacy_set(opt_args[OPT_ARG_PRIVACY], pa->privcid,
_flag[i]);
}
@@ -1079,8 +1058,8 @@
ast_filedelete(pa->privintro, NULL);
if( ast_fileexists(pa->privintro, NULL, NULL ) > 0 )
ast_log(LOG_NOTICE, "privacy: ast_filedelete
didn't do its job on %s\n", pa->privintro);
- else if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Successfully
deleted %s intro file\n", pa->privintro);
+ else
+ ast_verb(3, "Successfully deleted %s intro
file\n", pa->privintro);
}
return 0; /* the good exit path */
} else {
@@ -1101,13 +1080,11 @@
l = ast_strdupa(chan->cid.cid_num);
ast_shrink_phone_number(l);
if (ast_test_flag64(opts, OPT_PRIVACY) ) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Privacy DB is
'%s', clid is '%s'\n",
+ ast_verb(3, "Privacy DB is '%s', clid is '%s'\n",
opt_args[OPT_ARG_PRIVACY], l);
pa->privdb_val =
ast_privacy_check(opt_args[OPT_ARG_PRIVACY], l);
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Privacy
Screening, clid is '%s'\n", l);
+ ast_verb(3, "Privacy Screening, clid is '%s'\n", l);
pa->privdb_val = AST_PRIVACY_UNKNOWN;
}
} else {
@@ -1119,8 +1096,7 @@
if (*tn2=='/') /* any other chars to be afraid of? */
*tn2 = '=';
}
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Privacy-- callerid is
empty\n");
+ ast_verb(3, "Privacy-- callerid is empty\n");
snprintf(callerid, sizeof(callerid), "NOCALLERID_%s%s",
chan->exten, tnam);
l = callerid;
@@ -1184,8 +1160,8 @@
ast_filedelete(pa->privintro, NULL);
if (ast_fileexists(pa->privintro,NULL,NULL ) >
0 )
ast_log(LOG_NOTICE,"privacy:
ast_filedelete didn't do its job on %s\n", pa->privintro);
- else if (option_verbose > 2)
- ast_verbose( VERBOSE_PREFIX_3
"Successfully deleted %s intro file\n", pa->privintro);
+ else
+ ast_verb(3, "Successfully deleted %s
intro file\n", pa->privintro);
return -1;
}
if (!ast_streamfile(chan, "vm-dialout", chan->language)
)
@@ -1256,8 +1232,7 @@
if (ast_test_flag64(&opts, OPT_OPERMODE)) {
opermode = ast_strlen_zero(opt_args[OPT_ARG_OPERMODE]) ? 1 :
atoi(opt_args[OPT_ARG_OPERMODE]);
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Setting operator services
mode to %d.\n", opermode);
+ ast_verb(3, "Setting operator services mode to %d.\n",
opermode);
}
if (ast_test_flag64(&opts, OPT_DURATION_STOP) &&
!ast_strlen_zero(opt_args[OPT_ARG_DURATION_STOP])) {
@@ -1267,8 +1242,7 @@
pbx_builtin_setvar_helper(chan, "DIALSTATUS",
pa.status);
goto done;
}
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Setting call duration
limit to %d seconds.\n", calldurationlimit);
+ ast_verb(3, "Setting call duration limit to %d seconds.\n",
calldurationlimit);
}
if (ast_test_flag64(&opts, OPT_SENDDTMF) &&
!ast_strlen_zero(opt_args[OPT_ARG_SENDDTMF])) {
@@ -1358,8 +1332,7 @@
}
tmp->forwards++;
if (tmp->forwards < AST_MAX_FORWARDS) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Now
forwarding %s to '%s/%s' (thanks to %s)\n",
+ ast_verb(3, "Now forwarding %s to '%s/%s'
(thanks to %s)\n",
chan->name, tech, stuff, tc->name);
ast_hangup(tc);
/* If we have been told to ignore forwards,
just set this channel to null
@@ -1367,8 +1340,7 @@
if (ast_test_flag64(&opts,
OPT_IGNORE_FORWARDING)) {
tc = NULL;
cause = AST_CAUSE_BUSY;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"Forwarding %s to '%s/%s' prevented.\n",
+ ast_verb(3, "Forwarding %s to '%s/%s'
prevented.\n",
chan->name, tech,
stuff);
} else {
tc = ast_request(tech,
chan->nativeformats, stuff, &cause);
@@ -1378,8 +1350,7 @@
else
ast_channel_inherit_variables(chan, tc);
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Too many
forwards from %s\n", tc->name);
+ ast_verb(3, "Too many forwards from %s\n",
tc->name);
ast_hangup(tc);
tc = NULL;
cause = AST_CAUSE_CONGESTION;
@@ -1443,16 +1414,14 @@
if (res) {
/* Again, keep going even if there's an error */
ast_debug(1, "ast call on peer returned %d\n", res);
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Couldn't call
%s\n", numsubst);
+ ast_verb(3, "Couldn't call %s\n", numsubst);
ast_hangup(tc);
tc = NULL;
ast_free(tmp);
continue;
} else {
senddialevent(chan, tc);
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Called %s\n",
numsubst);
+ ast_verb(3, "Called %s\n", numsubst);
if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID))
ast_set_callerid(tc, S_OR(chan->macroexten,
chan->exten), get_cid_name(cidname, sizeof(cidname), chan), NULL);
}
@@ -1808,8 +1777,7 @@
if ((res = ast_spawn_extension(peer,
peer->context, peer->exten, peer->priority, peer->cid.cid_num))) {
/* Something bad happened, or a hangup
has been requested. */
ast_debug(1, "Spawn extension
(%s,%s,%d) exited non-zero on '%s'\n", peer->context, peer->exten,
peer->priority, peer->name);
- if (option_verbose > 1)
- ast_verbose( VERBOSE_PREFIX_2
"Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", peer->context,
peer->exten, peer->priority, peer->name);
+ ast_verb(2, "Spawn extension (%s, %s,
%d) exited non-zero on '%s'\n", peer->context, peer->exten, peer->priority,
peer->name);
break;
}
peer->priority++;
Modified: trunk/apps/app_flash.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_flash.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_flash.c (original)
+++ trunk/apps/app_flash.c Thu Jul 26 10:49:18 2007
@@ -92,8 +92,7 @@
zt_wait_event(chan->fds[0]);
}
res = ast_safe_sleep(chan, 1000);
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Flashed
channel %s\n", chan->name);
+ ast_verb(3, "Flashed channel %s\n", chan->name);
} else
ast_log(LOG_WARNING, "Unable to flash channel
%s: %s\n", chan->name, strerror(errno));
} else
Modified: trunk/apps/app_followme.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_followme.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_followme.c (original)
+++ trunk/apps/app_followme.c Thu Jul 26 10:49:18 2007
@@ -487,8 +487,7 @@
if (!AST_LIST_EMPTY(findme_user_list)) {
if (!caller) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Original caller
hungup. Cleanup.\n");
+ ast_verb(3, "Original caller hungup. Cleanup.\n");
clear_calling_tree(findme_user_list);
return NULL;
}
@@ -508,8 +507,7 @@
if (tmpuser->state == 3)
tmpuser->digts += (towas - wtd);
if (tmpuser->digts && (tmpuser->digts >
featuredigittimeout)) {
- if (option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "We've been waiting for digits longer than we
should have.\n");
+ ast_verb(3, "We've been waiting
for digits longer than we should have.\n");
if
(!ast_strlen_zero(namerecloc)) {
tmpuser->state = 1;
tmpuser->digts = 0;
@@ -538,8 +536,7 @@
else if (tmpto < 0 &&
!tmpuser->ochan->timingfunc) {
ast_stopstream(tmpuser->ochan);
if (tmpuser->state ==
1) {
- if
(option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "Playback of the call-from file appears to be
done.\n");
+ ast_verb(3,
"Playback of the call-from file appears to be done.\n");
if
(!ast_streamfile(tmpuser->ochan, namerecloc, tmpuser->ochan->language)) {
tmpuser->state = 2;
} else {
@@ -554,8 +551,7 @@
}
}
} else if
(tmpuser->state == 2) {
- if
(option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "Playback of name file appears to be done.\n");
+ ast_verb(3,
"Playback of name file appears to be done.\n");
memset(tmpuser->yn, 0, sizeof(tmpuser->yn));
tmpuser->ynidx
= 0;
if
(!ast_streamfile(tmpuser->ochan, pressbuttonname, tmpuser->ochan->language)) {
@@ -565,8 +561,7 @@
return
NULL;
}
} else if
(tmpuser->state == 3) {
- if
(option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "Playback of the next step file appears to be
done.\n");
+ ast_verb(3,
"Playback of the next step file appears to be done.\n");
tmpuser->digts
= 0;
}
}
@@ -587,8 +582,7 @@
totalwait -= tmpto;
wtd = to;
if (totalwait <= 0) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "We've hit
our timeout for this step. Drop everyone and move on to the next one. %ld\n",
totalwait);
+ ast_verb(3, "We've hit our timeout for this
step. Drop everyone and move on to the next one. %ld\n", totalwait);
clear_calling_tree(findme_user_list);
return NULL;
}
@@ -606,22 +600,20 @@
switch(f->subclass) {
case AST_CONTROL_HANGUP:
if (option_verbose > 2)
- ast_verbose(
VERBOSE_PREFIX_3 "%s received a hangup frame.\n", winner->name);
+ ast_verb(3, "%s
received a hangup frame.\n", winner->name);
if (dg == 0) {
- if
(option_verbose > 2)
-
ast_verbose( VERBOSE_PREFIX_3 "The calling channel hungup. Need to drop
everyone else.\n");
+ ast_verb(3,
"The calling channel hungup. Need to drop everyone else.\n");
clear_calling_tree(findme_user_list);
ctstatus = -1;
}
break;
case AST_CONTROL_ANSWER:
if (option_verbose > 2)
- ast_verbose(
VERBOSE_PREFIX_3 "%s answered %s\n", winner->name, caller->name);
+ ast_verb(3, "%s
answered %s\n", winner->name, caller->name);
/* If call has been
answered, then the eventual hangup is likely to be normal hangup */
winner->hangupcause =
AST_CAUSE_NORMAL_CLEARING;
caller->hangupcause =
AST_CAUSE_NORMAL_CLEARING;
- if (option_verbose > 2)
- ast_verbose(
VERBOSE_PREFIX_3 "Starting playback of %s\n", callfromname);
+ ast_verb(3, "Starting
playback of %s\n", callfromname);
if (dg > 0) {
if
(!ast_strlen_zero(namerecloc)) {
if
(!ast_streamfile(winner, callfromname, winner->language)) {
@@ -645,44 +637,35 @@
}
break;
case AST_CONTROL_BUSY:
- if (option_verbose > 2)
- ast_verbose(
VERBOSE_PREFIX_3 "%s is busy\n", winner->name);
+ ast_verb(3, "%s is
busy\n", winner->name);
break;
case AST_CONTROL_CONGESTION:
- if (option_verbose > 2)
- ast_verbose(
VERBOSE_PREFIX_3 "%s is circuit-busy\n", winner->name);
+ ast_verb(3, "%s is
circuit-busy\n", winner->name);
break;
case AST_CONTROL_RINGING:
- if (option_verbose > 2)
- ast_verbose(
VERBOSE_PREFIX_3 "%s is ringing\n", winner->name);
+ ast_verb(3, "%s is
ringing\n", winner->name);
break;
case AST_CONTROL_PROGRESS:
- if (option_verbose > 2)
- ast_verbose (
VERBOSE_PREFIX_3 "%s is making progress passing it to %s\n", winner->name,
caller->name);
+ ast_verb(3, "%s is
making progress passing it to %s\n", winner->name, caller->name);
break;
case AST_CONTROL_VIDUPDATE:
- if (option_verbose > 2)
- ast_verbose (
VERBOSE_PREFIX_3 "%s requested a video update, passing it to %s\n",
winner->name, caller->name);
+ ast_verb(3, "%s
requested a video update, passing it to %s\n", winner->name, caller->name);
break;
case AST_CONTROL_PROCEEDING:
- if (option_verbose > 2)
- ast_verbose (
VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n",
winner->name,caller->name);
+ ast_verb(3, "%s is
proceeding passing it to %s\n", winner->name,caller->name);
break;
case AST_CONTROL_HOLD:
- if (option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "Call on %s placed on hold\n", winner->name);
+ ast_verb(3, "Call on %s
placed on hold\n", winner->name);
break;
case AST_CONTROL_UNHOLD:
- if (option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "Call on %s left from hold\n", winner->name);
+ ast_verb(3, "Call on %s
left from hold\n", winner->name);
break;
case AST_CONTROL_OFFHOOK:
case AST_CONTROL_FLASH:
/* Ignore going off
hook and flash */
break;
case -1:
- if (option_verbose > 2)
- ast_verbose(
VERBOSE_PREFIX_3 "%s stopped sounds\n", winner->name);
+ ast_verb(3, "%s stopped
sounds\n", winner->name);
break;
default:
ast_debug(1, "Dunno
what to do with control type %d\n", f->subclass);
@@ -727,8 +710,7 @@
livechannels--;
ast_debug(1, "live
channels left %d\n", livechannels);
if (!livechannels) {
- if
(option_verbose > 2)
-
ast_verbose(VERBOSE_PREFIX_3 "no live channels left. exiting.\n");
+ ast_verb(3, "no
live channels left. exiting.\n");
return NULL;
}
}
@@ -740,8 +722,7 @@
}
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "couldn't reach at this
number.\n");
+ ast_verb(3, "couldn't reach at this number.\n");
}
/* --- WAIT FOR WINNER NUMBER END! -----------*/
@@ -809,8 +790,7 @@
if (outbound) {
ast_set_callerid(outbound, caller->cid.cid_num,
caller->cid.cid_name, caller->cid.cid_num);
ast_channel_inherit_variables(tpargs->chan,
outbound);
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "calling
%s\n", dialarg);
+ ast_verb(3, "calling %s\n", dialarg);
if (!ast_call(outbound,dialarg,0)) {
tmpuser->ochan = outbound;
tmpuser->state = 0;
@@ -818,8 +798,7 @@
ast_copy_string(tmpuser->dialarg,
dialarg, sizeof(dialarg));
AST_LIST_INSERT_TAIL(findme_user_list,
tmpuser, entry);
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3
"couldn't reach at this number.\n");
+ ast_verb(3, "couldn't reach at this
number.\n");
if (outbound) {
if (!outbound->cdr)
outbound->cdr =
ast_cdr_alloc();
Modified: trunk/apps/app_getcpeid.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_getcpeid.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_getcpeid.c (original)
+++ trunk/apps/app_getcpeid.c Thu Jul 26 10:49:18 2007
@@ -85,8 +85,7 @@
res = ast_adsi_get_cpeid(chan, cpeid, 0);
if (res > 0) {
gotcpeid = 1;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Got CPEID of
'%02x:%02x:%02x:%02x' on '%s'\n", cpeid[0], cpeid[1], cpeid[2], cpeid[3],
chan->name);
+ ast_verb(3, "Got CPEID of '%02x:%02x:%02x:%02x' on
'%s'\n", cpeid[0], cpeid[1], cpeid[2], cpeid[3], chan->name);
}
if (res > -1) {
strcpy(data[1], "Measuring CPE...");
@@ -94,8 +93,7 @@
cpeid_setstatus(chan, data, 0);
res = ast_adsi_get_cpeinfo(chan, &width, &height,
&buttons, 0);
if (res > -1) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "CPE has
%d lines, %d columns, and %d buttons on '%s'\n", height, width, buttons,
chan->name);
+ ast_verb(3, "CPE has %d lines, %d columns, and
%d buttons on '%s'\n", height, width, buttons, chan->name);
gotgeometry = 1;
}
}
Modified: trunk/apps/app_macro.c
URL:
http://svn.digium.com/view/asterisk/trunk/apps/app_macro.c?view=diff&rev=77299&r1=77298&r2=77299
==============================================================================
--- trunk/apps/app_macro.c (original)
+++ trunk/apps/app_macro.c Thu Jul 26 10:49:18 2007
@@ -313,14 +313,12 @@
goto out;
case AST_PBX_KEEPALIVE:
[... 6231 lines stripped ...]
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
