diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-10 07:07:30 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-10 07:07:30 +0000 |
commit | f286b06842c4c06e6b93430364120e58a0684665 (patch) | |
tree | caef04124c3d3cc4c2de86ff58c0dc76594f0655 /apps | |
parent | cf69038818f139a8394ebbf21cbfb6f560224bad (diff) |
Merged revisions 174503 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r174503 | tilghman | 2009-02-10 01:06:29 -0600 (Tue, 10 Feb 2009) | 2 lines
Fix0ring build
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@174504 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_stack.c | 8 | ||||
-rw-r--r-- | apps/app_voicemail.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index 6f5093e09..1b7651906 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -464,7 +464,9 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg if ((res = pbx_exec(chan, theapp, gosub_args)) == 0) { struct ast_pbx *pbx = chan->pbx; - struct ast_pbx_args args = { .no_hangup_chan = 1 }; + struct ast_pbx_args args; + memset(&args, 0, sizeof(args)); + args.no_hangup_chan = 1; /* Suppress warning about PBX already existing */ chan->pbx = NULL; ast_agi_send(agi->fd, chan, "100 result=0 Trying...\n"); @@ -501,8 +503,6 @@ struct agi_command gosub_agi_command = static int unload_module(void) { - struct ast_context *con; - if (ast_agi_unregister) { ast_agi_unregister(ast_module_info->self, &gosub_agi_command); } @@ -518,8 +518,6 @@ static int unload_module(void) static int load_module(void) { - struct ast_context *con; - /* usage of AGI is optional, so check to see if the ast_agi_register() function is available; if so, use it. */ diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 138b024c2..504396143 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1009,8 +1009,8 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable * ast_copy_string(retval->imapuser, tmp->value, sizeof(retval->imapuser)); } else if (!strcasecmp(tmp->name, "imappassword") || !strcasecmp(tmp->name, "imapsecret")) { ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword)); - } else if (!strcasecmp(tmp->name, "imapvmshareid")) { - ast_copy_string(retval->imapvmshareid, tmp->value, sizeof(retval->imapvmshareid)); + } else if (!strcasecmp(var->name, "imapvmshareid")) { + ast_copy_string(retval->imapvmshareid, var->value, sizeof(retval->imapvmshareid)); #endif } else apply_option(retval, tmp->name, tmp->value); |