From 907ed4d346bd035123b48230adb114a72e032aff Mon Sep 17 00:00:00 2001 From: Anthony Minessale II Date: Tue, 28 Dec 2004 14:53:40 +0000 Subject: [PATCH] tiny tweak to allow pvt config engines to use __ast_load git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4567 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- config.c | 8 ++++---- include/asterisk/config_pvt.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.c b/config.c index 31f4381580..f63e20a007 100755 --- a/config.c +++ b/config.c @@ -230,7 +230,7 @@ static struct ast_config_reg *get_config_registrations(void) } -static struct ast_config *__ast_load(const char *configfile, struct ast_config *tmp, struct ast_category **_tmpc, struct ast_variable **_last, int includelevel); + static int cfg_process(struct ast_config *tmp, struct ast_category **_tmpc, struct ast_variable **_last, char *buf, int lineno, const char *configfile, int includelevel ) { @@ -306,7 +306,7 @@ static int cfg_process(struct ast_config *tmp, struct ast_category **_tmpc, stru if(arg && cur) { ast_log(LOG_WARNING, "Including files with explicit config engine no longer permitted. Please use extconfig.conf to specify all mappings\n"); } else { - if (!__ast_load(cur, tmp, _tmpc, _last, includelevel + 1)) + if (!ast_internal_load(cur, tmp, _tmpc, _last, includelevel + 1)) return -1; } } else @@ -469,7 +469,7 @@ int ast_update_realtime(const char *family, const char *keyfield, const char *lo return res; } -static struct ast_config *__ast_load(const char *configfile, struct ast_config *tmp, struct ast_category **_tmpc, struct ast_variable **_last, int includelevel) +struct ast_config *ast_internal_load(const char *configfile, struct ast_config *tmp, struct ast_category **_tmpc, struct ast_variable **_last, int includelevel) { char fn[256]; char buf[8192]; @@ -676,7 +676,7 @@ struct ast_config *ast_load(char *configfile) struct ast_category *tmpc=NULL; struct ast_variable *last = NULL; - return __ast_load(configfile, NULL, &tmpc, &last, 0); + return ast_internal_load(configfile, NULL, &tmpc, &last, 0); } void ast_category_append(struct ast_config *config, struct ast_category *cat) diff --git a/include/asterisk/config_pvt.h b/include/asterisk/config_pvt.h index 2f5c80de9f..823be9533c 100755 --- a/include/asterisk/config_pvt.h +++ b/include/asterisk/config_pvt.h @@ -58,7 +58,7 @@ int ast_cust_config_register(struct ast_config_reg *new); int ast_cust_config_deregister(struct ast_config_reg *new); int register_config_cli(void); int read_ast_cust_config(void); - +struct ast_config *ast_internal_load(const char *configfile, struct ast_config *tmp, struct ast_category **_tmpc, struct ast_variable **_last, int includelevel);