diff options
| author | Matthew Fredrickson <creslin@digium.com> | 2006-09-19 21:07:49 +0000 |
|---|---|---|
| committer | Matthew Fredrickson <creslin@digium.com> | 2006-09-19 21:07:49 +0000 |
| commit | 33ddb536631cb9b46dc63923dbf79ead8db89186 (patch) | |
| tree | cf83670bfa579bddec4a254d9f6fc45e2a8a7829 /apps | |
| parent | fc60c151d3c49897088c148ea01304701b40c2a2 (diff) | |
Various updates from PCadach's chan_h323-live branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_macro.c | 4 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index 42b32dd83..21c2b7c62 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -238,14 +238,14 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) case AST_PBX_KEEPALIVE: if (option_debug) ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE in macro %s on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name); - if (option_verbose > 1) + else if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE in macro '%s' on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name); goto out; break; default: if (option_debug) ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro); - if (option_verbose > 1) + else if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro); dead = 1; goto out; diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 4e605e917..99e51f23b 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -4607,12 +4607,15 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu,int box) static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu) { int x = 0; +#ifndef IMAP_STORAGE + int res = 0, nummsg; +#endif + if (vms->lastmsg <= -1) goto done; vms->curmsg = -1; #ifndef IMAP_STORAGE - int res = 0, nummsg; /* Get the deleted messages fixed */ if (vm_lock_path(vms->curdir)) return ERROR_LOCK_PATH; |