diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-14 14:48:38 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-14 14:48:38 +0000 |
commit | 35d428bccae3ad607662249b9fd6c3a2d16b9364 (patch) | |
tree | eb8395c48dfe42302c76abaf23fc722e7e6190bf | |
parent | 3b2aaf764626c8870fd2c7de8805fb935e65b0db (diff) |
Convert ast_verbose to ast_verb.
Reported by: snuffy
Patch by: snuffy
(Closes issue #11547)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92913 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_amd.c | 15 | ||||
-rw-r--r-- | apps/app_chanspy.c | 3 | ||||
-rw-r--r-- | apps/app_dial.c | 23 | ||||
-rw-r--r-- | apps/app_minivm.c | 10 | ||||
-rw-r--r-- | apps/app_mixmonitor.c | 9 | ||||
-rw-r--r-- | apps/app_voicemail.c | 24 | ||||
-rw-r--r-- | channels/chan_skinny.c | 4 | ||||
-rw-r--r-- | main/asterisk.c | 9 | ||||
-rw-r--r-- | main/netsock.c | 14 | ||||
-rw-r--r-- | main/pbx.c | 3 | ||||
-rw-r--r-- | main/srv.c | 4 | ||||
-rw-r--r-- | res/res_features.c | 9 | ||||
-rw-r--r-- | res/snmp/agent.c | 5 |
13 files changed, 48 insertions, 84 deletions
diff --git a/apps/app_amd.c b/apps/app_amd.c index 0e1665395..70390f038 100644 --- a/apps/app_amd.c +++ b/apps/app_amd.c @@ -199,8 +199,7 @@ static void isAnsweringMachine(struct ast_channel *chan, void *data) 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 @@ static void isAnsweringMachine(struct ast_channel *chan, void *data) 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 @@ static void isAnsweringMachine(struct ast_channel *chan, void *data) 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); diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 250820fbc..a29973ff4 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -369,8 +369,7 @@ static int channel_spy(struct ast_channel *chan, struct ast_channel *spyee, int 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; } diff --git a/apps/app_dial.c b/apps/app_dial.c index d604dada5..db1f76c8d 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1121,11 +1121,10 @@ static int setup_privacy_args(struct privacy_args *pa, 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 @@ static int setup_privacy_args(struct privacy_args *pa, 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 @@ static int setup_privacy_args(struct privacy_args *pa, 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 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags 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); diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 20d10699b..77497fb19 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -1256,8 +1256,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re 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 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re /* 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 @@ static int leave_voicemail(struct ast_channel *chan, char *username, struct leav } 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); diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index c2f2a5b99..012af01c5 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -141,8 +141,7 @@ static void *mixmonitor_thread(void *obj) 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 @@ static void *mixmonitor_thread(void *obj) 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); } diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 17fb0010d..82ca5a303 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6743,8 +6743,7 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_ 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 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s 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 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re 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 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re } 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"); diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 0422a2392..5c821e183 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -1427,7 +1427,7 @@ static struct skinny_line *find_line_by_name(const char *dest) /* 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 @@ static struct skinny_line *find_line_by_name(const char *dest) /* 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 diff --git a/main/asterisk.c b/main/asterisk.c index 95778bfe4..67dc361d0 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -986,8 +986,7 @@ static void *netconsole(void *vconsole) 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 @@ static void *listener(void *unused) 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; diff --git a/main/netsock.c b/main/netsock.c index b5b6999f6..d10c0c344 100644 --- a/main/netsock.c +++ b/main/netsock.c @@ -149,18 +149,14 @@ int ast_netsock_set_qos(int netsocket, int tos, int cos) 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; diff --git a/main/pbx.c b/main/pbx.c index e40c274c9..e0a55ef3a 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3294,8 +3294,7 @@ static int __ast_pbx_run(struct ast_channel *c) 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"); diff --git a/main/srv.c b/main/srv.c index 644bf757b..3950e255f 100644 --- a/main/srv.c +++ b/main/srv.c @@ -224,10 +224,8 @@ int ast_get_srv(struct ast_channel *chan, char *host, int hostlen, int *port, co 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; diff --git a/res/res_features.c b/res/res_features.c index 6ee815b5b..8c843c173 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -765,8 +765,7 @@ static int builtin_automixmonitor(struct ast_channel *chan, struct ast_channel * // 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 @@ static int builtin_automixmonitor(struct ast_channel *chan, struct ast_channel * 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 @@ static int builtin_blindtransfer(struct ast_channel *chan, struct ast_channel *p } 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"); diff --git a/res/snmp/agent.c b/res/snmp/agent.c index 88d703dff..035c4945d 100644 --- a/res/snmp/agent.c +++ b/res/snmp/agent.c @@ -145,7 +145,7 @@ static oid asterisk_oid[] = { 1, 3, 6, 1, 4, 1, 22736, 1 }; 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 @@ void *agent_thread(void *arg) 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; } |