kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

tiny tweak to allow pvt config engines to use __ast_load

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4567 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Anthony Minessale II
2004-12-28 14:53:40 +00:00
parent aa01269484
commit 907ed4d346
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config.c
View File

@@ -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 ) 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) { 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"); ast_log(LOG_WARNING, "Including files with explicit config engine no longer permitted. Please use extconfig.conf to specify all mappings\n");
} else { } else {
if (!__ast_load(cur, tmp, _tmpc, _last, includelevel + 1)) if (!ast_internal_load(cur, tmp, _tmpc, _last, includelevel + 1))
return -1; return -1;
} }
} else } else
@@ -469,7 +469,7 @@ int ast_update_realtime(const char *family, const char *keyfield, const char *lo
return res; 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 fn[256];
char buf[8192]; char buf[8192];
@@ -676,7 +676,7 @@ struct ast_config *ast_load(char *configfile)
struct ast_category *tmpc=NULL; struct ast_category *tmpc=NULL;
struct ast_variable *last = 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) void ast_category_append(struct ast_config *config, struct ast_category *cat)

2
include/asterisk/config_pvt.h
View File

@@ -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 ast_cust_config_deregister(struct ast_config_reg *new);
int register_config_cli(void); int register_config_cli(void);
int read_ast_cust_config(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);