Merge config updates (bug #3406)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-25 06:10:20 +00:00
parent a611ce04f1
commit 5f726ad8c7
49 changed files with 881 additions and 856 deletions

4
enum.c
View File

@@ -413,7 +413,7 @@ int ast_enum_init(void)
free(sl);
}
toplevs = NULL;
cfg = ast_load("enum.conf");
cfg = ast_config_load("enum.conf");
if (cfg) {
sl = NULL;
v = ast_variable_browse(cfg, "general");
@@ -430,7 +430,7 @@ int ast_enum_init(void)
}
v = v->next;
}
ast_destroy(cfg);
ast_config_destroy(cfg);
} else {
toplevs = enum_newtoplev(TOPLEV);
}