mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-19 19:52:48 +00:00
Fix0ring build
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@174503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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) {
|
if ((res = pbx_exec(chan, theapp, gosub_args)) == 0) {
|
||||||
struct ast_pbx *pbx = chan->pbx;
|
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 */
|
/* Suppress warning about PBX already existing */
|
||||||
chan->pbx = NULL;
|
chan->pbx = NULL;
|
||||||
ast_agi_send(agi->fd, chan, "100 result=0 Trying...\n");
|
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)
|
static int unload_module(void)
|
||||||
{
|
{
|
||||||
struct ast_context *con;
|
|
||||||
|
|
||||||
if (ast_agi_unregister) {
|
if (ast_agi_unregister) {
|
||||||
ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
|
ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
|
||||||
}
|
}
|
||||||
@@ -654,8 +654,6 @@ static int unload_module(void)
|
|||||||
|
|
||||||
static int load_module(void)
|
static int load_module(void)
|
||||||
{
|
{
|
||||||
struct ast_context *con;
|
|
||||||
|
|
||||||
if (ast_agi_register) {
|
if (ast_agi_register) {
|
||||||
ast_agi_register(ast_module_info->self, &gosub_agi_command);
|
ast_agi_register(ast_module_info->self, &gosub_agi_command);
|
||||||
}
|
}
|
||||||
|
@@ -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));
|
ast_copy_string(retval->imapuser, var->value, sizeof(retval->imapuser));
|
||||||
} else if (!strcasecmp(var->name, "imappassword") || !strcasecmp(var->name, "imapsecret")) {
|
} else if (!strcasecmp(var->name, "imappassword") || !strcasecmp(var->name, "imapsecret")) {
|
||||||
ast_copy_string(retval->imappassword, var->value, sizeof(retval->imappassword));
|
ast_copy_string(retval->imappassword, var->value, sizeof(retval->imappassword));
|
||||||
} else if (!strcasecmp(tmp->name, "imapvmshareid")) {
|
} else if (!strcasecmp(var->name, "imapvmshareid")) {
|
||||||
ast_copy_string(retval->imapvmshareid, tmp->value, sizeof(retval->imapvmshareid));
|
ast_copy_string(retval->imapvmshareid, var->value, sizeof(retval->imapvmshareid));
|
||||||
#endif
|
#endif
|
||||||
} else
|
} else
|
||||||
apply_option(retval, var->name, var->value);
|
apply_option(retval, var->name, var->value);
|
||||||
|
Reference in New Issue
Block a user