Fix0ring build

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@174503 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_stack.c b/apps/app_stack.c
index 0edc6d16d2bfc54f1074910b74201b325cd87e27..a3a1bf401c24c545e86017a398babe6263612a57 100644 (file)
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -599,7 +599,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");
@@ -636,8 +638,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);
        }
@@ -654,8 +654,6 @@ static int unload_module(void)
 
 static int load_module(void)
 {
-       struct ast_context *con;
-
        if (ast_agi_register) {
                 ast_agi_register(ast_module_info->self, &gosub_agi_command);
        }

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 8b2fc989ca31411b34bba17637185f0281ee011d..6c84865b87c83253eb6048fe38fbd89503d82ff8 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1117,8 +1117,8 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable *
                        ast_copy_string(retval->imapuser, var->value, sizeof(retval->imapuser));
                } else if (!strcasecmp(var->name, "imappassword") || !strcasecmp(var->name, "imapsecret")) {
                        ast_copy_string(retval->imappassword, var->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, var->name, var->value);