[Asterisk-cvs] asterisk config.c,1.41,1.42
anthm at lists.digium.com
anthm at lists.digium.com
Tue Dec 28 09:58:47 CST 2004
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv12285
Modified Files:
config.c
Log Message:
tiny tweak to allow pvt config engines to use __ast_load
Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- config.c 19 Dec 2004 17:33:19 -0000 1.41
+++ config.c 28 Dec 2004 14:53:40 -0000 1.42
@@ -230,7 +230,7 @@
}
-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 @@
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 @@
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_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)
More information about the svn-commits
mailing list