[asterisk-commits] tilghman: trunk r92913 - in /trunk: apps/ channels/ main/ res/ res/snmp/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Dec 14 08:48:39 CST 2007
Author: tilghman
Date: Fri Dec 14 08:48:38 2007
New Revision: 92913
URL: http://svn.digium.com/view/asterisk?view=rev&rev=92913
Log:
Convert ast_verbose to ast_verb.
Reported by: snuffy
Patch by: snuffy
(Closes issue #11547)
Modified:
trunk/apps/app_amd.c
trunk/apps/app_chanspy.c
trunk/apps/app_dial.c
trunk/apps/app_minivm.c
trunk/apps/app_mixmonitor.c
trunk/apps/app_voicemail.c
trunk/channels/chan_skinny.c
trunk/main/asterisk.c
trunk/main/netsock.c
trunk/main/pbx.c
trunk/main/srv.c
trunk/res/res_features.c
trunk/res/snmp/agent.c
Modified: trunk/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_amd.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/apps/app_amd.c (original)
+++ trunk/apps/app_amd.c Fri Dec 14 08:48:38 2007
@@ -199,8 +199,7 @@
framelength = (ast_codec_get_samples(f) / DEFAULT_SAMPLES_PER_MS);
iTotalTime += framelength;
if (iTotalTime >= totalAnalysisTime) {
- 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 );
ast_frfree(f);
strcpy(amdStatus , "NOTSURE");
sprintf(amdCause , "TOOLONG-%d", iTotalTime);
@@ -216,16 +215,14 @@
if (silenceDuration >= betweenWordsSilence) {
if (currentState != STATE_IN_SILENCE ) {
previousState = currentState;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD: Changed state to STATE_IN_SILENCE\n");
+ ast_verb(3, "AMD: Changed state to STATE_IN_SILENCE\n");
}
currentState = STATE_IN_SILENCE;
consecutiveVoiceDuration = 0;
}
if (inInitialSilence == 1 && silenceDuration >= initialSilence) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: silenceDuration:%d initialSilence:%d\n",
+ ast_verb(3, "AMD: ANSWERING MACHINE: silenceDuration:%d initialSilence:%d\n",
silenceDuration, initialSilence);
ast_frfree(f);
strcpy(amdStatus , "MACHINE");
@@ -250,15 +247,13 @@
number of words if my previous state was Silence, which means that I moved into a word. */
if (consecutiveVoiceDuration >= minimumWordLength && currentState == STATE_IN_SILENCE) {
iWordsCount++;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD: Word detected. iWordsCount:%d\n", iWordsCount);
+ ast_verb(3, "AMD: Word detected. iWordsCount:%d\n", iWordsCount);
previousState = currentState;
currentState = STATE_IN_WORD;
}
if (iWordsCount >= maximumNumberOfWords) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: iWordsCount:%d\n", iWordsCount);
+ ast_verb(3, "AMD: ANSWERING MACHINE: iWordsCount:%d\n", iWordsCount);
ast_frfree(f);
strcpy(amdStatus , "MACHINE");
sprintf(amdCause , "MAXWORDS-%d-%d", iWordsCount, maximumNumberOfWords);
Modified: trunk/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_chanspy.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/apps/app_chanspy.c (original)
+++ trunk/apps/app_chanspy.c Fri Dec 14 08:48:38 2007
@@ -369,8 +369,7 @@
ast_audiohook_unlock(&csth.spy_audiohook);
ast_audiohook_destroy(&csth.spy_audiohook);
- if (option_verbose >= 2)
- ast_verbose(VERBOSE_PREFIX_2 "Done Spying on channel %s\n", name);
+ ast_verb(2, "Done Spying on channel %s\n", name);
return running;
}
Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Fri Dec 14 08:48:38 2007
@@ -1121,11 +1121,10 @@
l = ast_strdupa(chan->cid.cid_num);
ast_shrink_phone_number(l);
if (ast_test_flag64(opts, OPT_PRIVACY) ) {
- ast_verb(3, "Privacy DB is '%s', clid is '%s'\n",
- opt_args[OPT_ARG_PRIVACY], l);
+ 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 {
- ast_verb(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 {
@@ -1134,7 +1133,7 @@
tnam = ast_strdupa(chan->name);
/* clean the channel name so slashes don't try to end up in disk file name */
for (tn2 = tnam; *tn2; tn2++) {
- if (*tn2 == '/') /* any other chars to be afraid of? */
+ if (*tn2 == '/') /* any other chars to be afraid of? */
*tn2 = '=';
}
ast_verb(3, "Privacy-- callerid is empty\n");
@@ -1147,19 +1146,16 @@
ast_copy_string(pa->privcid, l, sizeof(pa->privcid));
if (strncmp(pa->privcid, "NOCALLERID", 10) != 0 && ast_test_flag64(opts, OPT_SCREEN_NOCLID)) {
- /* if callerid is set, and OPT_SCREEN_NOCLID is set also */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "CallerID set (%s); N option set; Screening should be off\n", pa->privcid);
+ /* if callerid is set and OPT_SCREEN_NOCLID is set also */
+ ast_verb(3, "CallerID set (%s); N option set; Screening should be off\n", pa->privcid);
pa->privdb_val = AST_PRIVACY_ALLOW;
- } else if (ast_test_flag64(opts, OPT_SCREEN_NOCLID) && strncmp(pa->privcid, "NOCALLERID", 10) == 0 ) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "CallerID blank; N option set; Screening should happen; dbval is %d\n", pa->privdb_val);
+ } else if (ast_test_flag64(opts, OPT_SCREEN_NOCLID) && strncmp(pa->privcid, "NOCALLERID", 10) == 0) {
+ ast_verb(3, "CallerID blank; N option set; Screening should happen; dbval is %d\n", pa->privdb_val);
}
if (pa->privdb_val == AST_PRIVACY_DENY) {
+ ast_verb(3, "Privacy DB reports PRIVACY_DENY for this callerid. Dial reports unavailable\n");
ast_copy_string(pa->status, "NOANSWER", sizeof(pa->status));
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Privacy DB reports PRIVACY_DENY for this callerid. Dial reports unavailable\n");
return 0;
} else if (pa->privdb_val == AST_PRIVACY_KILL) {
ast_copy_string(pa->status, "DONTCALL", sizeof(pa->status));
@@ -1832,8 +1828,7 @@
oprmode.peer = peer;
oprmode.mode = opermode;
- ast_channel_setoption(chan,
- AST_OPTION_OPRMODE, &oprmode, sizeof(oprmode), 0);
+ ast_channel_setoption(chan, AST_OPTION_OPRMODE, &oprmode, sizeof(oprmode), 0);
}
res = ast_bridge_call(chan, peer, &config);
end_time = time(NULL);
Modified: trunk/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_minivm.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/apps/app_minivm.c (original)
+++ trunk/apps/app_minivm.c Fri Dec 14 08:48:38 2007
@@ -1256,8 +1256,7 @@
switch (cmd) {
case '2':
/* Review */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Reviewing the message\n");
+ ast_verb(3, "Reviewing the message\n");
ast_streamfile(chan, recordfile, chan->language);
cmd = ast_waitstream(chan, AST_DIGIT_ANY);
break;
@@ -1266,9 +1265,9 @@
/* Record */
if (option_verbose > 2) {
if (recorded == 1)
- ast_verbose(VERBOSE_PREFIX_3 "Re-recording the message\n");
+ ast_verb(3, "Re-recording the message\n");
else
- ast_verbose(VERBOSE_PREFIX_3 "Recording the message\n");
+ ast_verb(3, "Recording the message\n");
}
if (recorded && outsidecaller)
cmd = ast_play_and_wait(chan, "beep");
@@ -1571,8 +1570,7 @@
}
if (duration < global_vmminmessage) {
- if (option_verbose > 2)
- ast_verbose( VERBOSE_PREFIX_3 "Recording was %d seconds long but needs to be at least %d - abandoning\n", duration, global_vmminmessage);
+ ast_verb(3, "Recording was %d seconds long but needs to be at least %d - abandoning\n", duration, global_vmminmessage);
fclose(txt);
ast_filedelete(tmptxtfile, NULL);
unlink(tmptxtfile);
Modified: trunk/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Fri Dec 14 08:48:38 2007
@@ -141,8 +141,7 @@
char *ext;
int errflag = 0;
- if (option_verbose > 1)
- ast_verbose(VERBOSE_PREFIX_2 "Begin MixMonitor Recording %s\n", mixmonitor->name);
+ ast_verb(2, "Begin MixMonitor Recording %s\n", mixmonitor->name);
ast_audiohook_lock(&mixmonitor->audiohook);
@@ -188,15 +187,13 @@
ast_audiohook_unlock(&mixmonitor->audiohook);
ast_audiohook_destroy(&mixmonitor->audiohook);
- if (option_verbose > 1)
- ast_verbose(VERBOSE_PREFIX_2 "End MixMonitor Recording %s\n", mixmonitor->name);
+ ast_verb(2, "End MixMonitor Recording %s\n", mixmonitor->name);
if (fs)
ast_closestream(fs);
if (mixmonitor->post_process) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_2 "Executing [%s]\n", mixmonitor->post_process);
+ ast_verb(2, "Executing [%s]\n", mixmonitor->post_process);
ast_safe_system(mixmonitor->post_process);
}
Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Dec 14 08:48:38 2007
@@ -6743,8 +6743,7 @@
if (chan->cid.cid_num) {
ast_copy_string(mailbox, chan->cid.cid_num, mailbox_size);
} else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Username not entered\n");
+ ast_verb(3,"Username not entered\n");
return -1;
}
}
@@ -8929,8 +8928,7 @@
char mailbox[AST_MAX_EXTENSION * 2 + 2];
snprintf(mailbox, sizeof(mailbox), "%s@%s", num, vmu->context);
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Leaving voicemail for '%s' in context '%s'\n", num, vmu->context);
+ ast_verb(3, "Leaving voicemail for '%s' in context '%s'\n", num, vmu->context);
memset(&leave_options, 0, sizeof(leave_options));
leave_options.record_gain = record_gain;
@@ -9005,8 +9003,7 @@
break;
} else {
/* Otherwise 1 is to save the existing message */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Saving message as is\n");
+ ast_verb(3, "Saving message as is\n");
if (!outsidecaller)
ast_filerename(tempfile, recordfile, NULL);
ast_stream_and_wait(chan, "vm-msgsaved", "");
@@ -9019,20 +9016,17 @@
}
case '2':
/* Review */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Reviewing the message\n");
+ ast_verb(3, "Reviewing the message\n");
cmd = ast_stream_and_wait(chan, tempfile, AST_DIGIT_ANY);
break;
case '3':
message_exists = 0;
/* Record */
- if (recorded == 1) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Re-recording the message\n");
- } else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Recording the message\n");
- }
+ if (recorded == 1)
+ ast_verb(3, "Re-recording the message\n");
+ else
+ ast_verb(3, "Recording the message\n");
+
if (recorded && outsidecaller) {
cmd = ast_play_and_wait(chan, INTRO);
cmd = ast_play_and_wait(chan, "beep");
Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Fri Dec 14 08:48:38 2007
@@ -1427,7 +1427,7 @@
/* This is a match, since we're checking for line on every device. */
} else if (!strcasecmp(d->name, device)) {
if (skinnydebug)
- ast_verbose(VERBOSE_PREFIX_2 "Found device: %s\n", d->name);
+ ast_verb(2, "Found device: %s\n", d->name);
} else
continue;
@@ -1436,7 +1436,7 @@
/* Search for the right line */
if (!strcasecmp(l->name, line)) {
if (tmpl) {
- ast_verbose(VERBOSE_PREFIX_2 "Ambiguous line name: %s\n", line);
+ ast_verb(2, "Ambiguous line name: %s\n", line);
ast_mutex_unlock(&devicelock);
return NULL;
} else
Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Fri Dec 14 08:48:38 2007
@@ -986,8 +986,7 @@
break;
}
}
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Remote UNIX connection disconnected\n");
+ ast_verb(3, "Remote UNIX connection disconnected\n");
close(con->fd);
close(con->p[0]);
close(con->p[1]);
@@ -1050,10 +1049,8 @@
fdprint(s, "No more connections allowed\n");
ast_log(LOG_WARNING, "No more connections allowed\n");
close(s);
- } else if (consoles[x].fd > -1) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Remote UNIX connection\n");
- }
+ } else if (consoles[x].fd > -1)
+ ast_verb(3, "Remote UNIX connection\n");
}
}
return NULL;
Modified: trunk/main/netsock.c
URL: http://svn.digium.com/view/asterisk/trunk/main/netsock.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/main/netsock.c (original)
+++ trunk/main/netsock.c Fri Dec 14 08:48:38 2007
@@ -149,18 +149,14 @@
if ((res = setsockopt(netsocket, IPPROTO_IP, IP_TOS, &tos, sizeof(tos))))
ast_log(LOG_WARNING, "Unable to set TOS to %d\n", tos);
- else {
- if (option_verbose > 1)
- ast_verbose(VERBOSE_PREFIX_2 "Using TOS bits %d\n", tos);
- }
+ else
+ ast_verb(2, "Using TOS bits %d\n", tos);
#if defined(linux)
if (setsockopt(netsocket, SOL_SOCKET, SO_PRIORITY, &cos, sizeof(cos)))
- ast_log(LOG_WARNING, "Unable to set CoS to %d\n", cos);
- else {
- if (option_verbose > 1)
- ast_verbose(VERBOSE_PREFIX_2 "Using CoS mark %d\n", cos);
- }
+ ast_log(LOG_WARNING, "Unable to set CoS to %d\n", cos);
+ else
+ ast_verb(2, "Using CoS mark %d\n", cos);
#endif
return res;
Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Fri Dec 14 08:48:38 2007
@@ -3294,8 +3294,7 @@
if ((res == AST_PBX_ERROR) && ast_exists_extension(c, c->context, "e", 1, c->cid.cid_num)) {
/* if we are already on the 'e' exten, don't jump to it again */
if (!strcmp(c->exten, "e")) {
- if (option_verbose > 1)
- ast_verbose(VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited ERROR while already on 'e' exten on '%s'\n", c->context, c->exten, c->priority, c->name);
+ ast_verb(2, "Spawn extension (%s, %s, %d) exited ERROR while already on 'e' exten on '%s'\n", c->context, c->exten, c->priority, c->name);
error = 1;
} else {
pbx_builtin_raise_exception(c, "ERROR");
Modified: trunk/main/srv.c
URL: http://svn.digium.com/view/asterisk/trunk/main/srv.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/main/srv.c (original)
+++ trunk/main/srv.c Fri Dec 14 08:48:38 2007
@@ -224,10 +224,8 @@
ast_copy_string(host, current->host, hostlen);
*port = current->port;
ast_free(current);
- if (option_verbose > 3) {
- ast_verbose(VERBOSE_PREFIX_3 "ast_get_srv: SRV lookup for '%s' mapped to host %s, port %d\n",
+ ast_verb(3, "ast_get_srv: SRV lookup for '%s' mapped to host %s, port %d\n",
service, host, *port);
- }
} else {
host[0] = '\0';
*port = -1;
Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Fri Dec 14 08:48:38 2007
@@ -765,8 +765,7 @@
// This means a mixmonitor is attached to the channel, running or not is unknown.
if (count > 0) {
- if (option_verbose > 3)
- ast_verbose(VERBOSE_PREFIX_3 "User hit '%s' to stop recording call.\n", code);
+ ast_verb(3, "User hit '%s' to stop recording call.\n", code);
//Make sure they are running
ast_channel_lock(callee_chan);
@@ -821,8 +820,7 @@
args[x] = '-';
}
- if (option_verbose > 3)
- ast_verbose(VERBOSE_PREFIX_3 "User hit '%s' to record call. filename: %s\n", code, touch_filename);
+ ast_verb(3, "User hit '%s' to record call. filename: %s\n", code, touch_filename);
pbx_exec(callee_chan, mixmonitor_app, args);
pbx_builtin_setvar_helper(callee_chan, "TOUCH_MIXMONITOR_OUTPUT", touch_filename);
@@ -945,8 +943,7 @@
}
if (!transferee->pbx) {
/* Doh! Use our handy async_goto functions */
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Transferring %s to '%s' (context %s) priority 1\n"
+ ast_verb(3, "Transferring %s to '%s' (context %s) priority 1\n"
,transferee->name, xferto, transferer_real_context);
if (ast_async_goto(transferee, transferer_real_context, xferto, 1))
ast_log(LOG_WARNING, "Async goto failed :-(\n");
Modified: trunk/res/snmp/agent.c
URL: http://svn.digium.com/view/asterisk/trunk/res/snmp/agent.c?view=diff&rev=92913&r1=92912&r2=92913
==============================================================================
--- trunk/res/snmp/agent.c (original)
+++ trunk/res/snmp/agent.c Fri Dec 14 08:48:38 2007
@@ -145,7 +145,7 @@
void *agent_thread(void *arg)
{
- ast_verbose(VERBOSE_PREFIX_2 "Starting %sAgent\n", res_snmp_agentx_subagent ? "Sub" : "");
+ ast_verb(2, "Starting %sAgent\n", res_snmp_agentx_subagent ? "Sub" : "");
snmp_enable_stderrlog();
@@ -168,8 +168,7 @@
snmp_shutdown("asterisk");
- ast_verbose(VERBOSE_PREFIX_2 "Terminating %sAgent\n",
- res_snmp_agentx_subagent ? "Sub" : "");
+ ast_verb(2, "Terminating %sAgent\n", res_snmp_agentx_subagent ? "Sub" : "");
return NULL;
}
More information about the asterisk-commits
mailing list