diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-25 06:10:20 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-25 06:10:20 +0000 |
commit | 2207b9a515214bf72785eabf75bd587bd7df23e8 (patch) | |
tree | 5e740f79246c281ef1bc43bcffc87fd21f676005 /pbx/pbx_config.c | |
parent | c7f2030d7977ded782c6430a33e57bbbb69cd6df (diff) |
Merge config updates (bug #3406)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4889 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/pbx_config.c')
-rwxr-xr-x | pbx/pbx_config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index a840e2bd2..74f951f62 100755 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -972,13 +972,13 @@ static int handle_save_dialplan(int fd, int argc, char *argv[]) snprintf(filename, sizeof(filename), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, config); - cfg = ast_load("extensions.conf"); + cfg = ast_config_load("extensions.conf"); /* try to lock contexts list */ if (ast_lock_contexts()) { ast_cli(fd, "Failed to lock contexts list\n"); ast_mutex_unlock(&save_dialplan_lock); - ast_destroy(cfg); + ast_config_destroy(cfg); return RESULT_FAILURE; } @@ -988,7 +988,7 @@ static int handle_save_dialplan(int fd, int argc, char *argv[]) filename); ast_unlock_contexts(); ast_mutex_unlock(&save_dialplan_lock); - ast_destroy(cfg); + ast_config_destroy(cfg); return RESULT_FAILURE; } @@ -1006,7 +1006,7 @@ static int handle_save_dialplan(int fd, int argc, char *argv[]) fprintf(output, "\n"); } - ast_destroy(cfg); + ast_config_destroy(cfg); /* walk all contexts */ c = ast_walk_contexts(NULL); @@ -1623,7 +1623,7 @@ static int pbx_load_module(void) char realvalue[256]; int lastpri = -2; - cfg = ast_load(config); + cfg = ast_config_load(config); if (cfg) { /* Use existing config to populate the PBX table */ static_config = ast_true(ast_variable_retrieve(cfg, "general", @@ -1775,7 +1775,7 @@ static int pbx_load_module(void) } cxt = ast_category_browse(cfg, cxt); } - ast_destroy(cfg); + ast_config_destroy(cfg); } ast_merge_contexts_and_delete(&local_contexts,registrar); |