diff options
Diffstat (limited to 'pbx')
-rw-r--r-- | pbx/pbx_config.c | 6 | ||||
-rw-r--r-- | pbx/pbx_dundi.c | 2 | ||||
-rw-r--r-- | pbx/pbx_loopback.c | 4 | ||||
-rw-r--r-- | pbx/pbx_realtime.c | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 9b112dc18..0a62da744 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1390,7 +1390,6 @@ static int pbx_load_config(const char *config_file) ast_copy_string(userscontext, "default", sizeof(userscontext)); for (v = ast_variable_browse(cfg, "globals"); v; v = v->next) { - memset(realvalue, 0, sizeof(realvalue)); pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1); pbx_builtin_setvar_helper(NULL, v->name, realvalue); } @@ -1487,20 +1486,17 @@ static int pbx_load_config(const char *config_file) free(tc); } } else if (!strcasecmp(v->name, "include")) { - memset(realvalue, 0, sizeof(realvalue)); pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1); if (ast_context_add_include2(con, realvalue, registrar)) ast_log(LOG_WARNING, "Unable to include context '%s' in context '%s'\n", v->value, cxt); } else if (!strcasecmp(v->name, "ignorepat")) { - memset(realvalue, 0, sizeof(realvalue)); pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1); if (ast_context_add_ignorepat2(con, realvalue, registrar)) ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s'\n", v->value, cxt); } else if (!strcasecmp(v->name, "switch") || !strcasecmp(v->name, "lswitch") || !strcasecmp(v->name, "eswitch")) { char *stringp = realvalue; char *appl, *data; - - memset(realvalue, 0, sizeof(realvalue)); + if (!strcasecmp(v->name, "switch")) pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1); else diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 05d957363..7f3e06679 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -533,7 +533,7 @@ struct dundi_query_state { static int get_mapping_weight(struct dundi_mapping *map) { - char buf[32] = ""; + char buf[32]; if (map->weightstr) { pbx_substitute_variables_helper(NULL, map->weightstr, buf, sizeof(buf) - 1); diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index dcbef909b..3221fb65d 100644 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -87,7 +87,6 @@ static char *loopback_helper(char *buf, int buflen, const char *exten, const cha char tmp[80]; snprintf(tmp, sizeof(tmp), "%d", priority); - memset(buf, 0, buflen); AST_LIST_HEAD_INIT_NOLOCK(&headp); AST_LIST_INSERT_HEAD(&headp, ast_var_assign("EXTEN", exten), entries); AST_LIST_INSERT_HEAD(&headp, ast_var_assign("CONTEXT", context), entries); @@ -141,8 +140,9 @@ static int loopback_canmatch(struct ast_channel *chan, const char *context, cons static int loopback_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data) { + int found; LOOPBACK_COMMON; - res = ast_spawn_extension(chan, newcontext, newexten, newpriority, callerid); + res = ast_spawn_extension(chan, newcontext, newexten, newpriority, callerid, &found, 0); /* XXX hmmm... res is overridden ? */ if (newpattern && !ast_extension_match(newpattern, exten)) res = -1; diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 31d266d0e..d733dc052 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -191,7 +191,7 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch if (!ast_strlen_zero(app)) { struct ast_app *a = pbx_findapp(app); if (a) { - char appdata[512]=""; + char appdata[512]; char tmp1[80]; char tmp2[80]; char tmp3[EXT_DATA_SIZE]; |