diff options
| author | Mark Spencer <markster@digium.com> | 2005-01-25 06:10:20 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2005-01-25 06:10:20 +0000 |
| commit | 5f726ad8c72afd54c2909f25f2eab36e937321ab (patch) | |
| tree | 5e740f79246c281ef1bc43bcffc87fd21f676005 /asterisk.c | |
| parent | a611ce04f16e647cf072a380579cb3d64c538645 (diff) | |
Merge config updates (bug #3406)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'asterisk.c')
| -rwxr-xr-x | asterisk.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/asterisk.c b/asterisk.c index 1b11bf292..27fddf945 100755 --- a/asterisk.c +++ b/asterisk.c @@ -48,7 +48,6 @@ #include "editline/histedit.h" #include "asterisk.h" #include <asterisk/config.h> -#include <asterisk/config_pvt.h> #include <sys/resource.h> #include <grp.h> #include <pwd.h> @@ -1498,11 +1497,11 @@ static void ast_readconfig(void) { char *config = ASTCONFPATH; if (option_overrideconfig == 1) { - cfg = ast_load((char *)ast_config_AST_CONFIG_FILE); + cfg = ast_config_load((char *)ast_config_AST_CONFIG_FILE); if (!cfg) ast_log(LOG_WARNING, "Unable to open specified master config file '%s', using builtin defaults\n", ast_config_AST_CONFIG_FILE); } else { - cfg = ast_load(config); + cfg = ast_config_load(config); } /* init with buildtime config */ @@ -1571,7 +1570,7 @@ static void ast_readconfig(void) { } v = v->next; } - ast_destroy(cfg); + ast_config_destroy(cfg); } int main(int argc, char *argv[]) @@ -1742,10 +1741,10 @@ int main(int argc, char *argv[]) ast_readconfig(); if (option_console && !option_verbose) - ast_verbose("[ Initializing Custom Configuration Options]"); + ast_verbose("[ Initializing Custom Configuration Options ]"); /* custom config setup */ register_config_cli(); - read_ast_cust_config(); + read_config_maps(); if (option_console) { |