Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

repeal config prototype changes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Anthony Minessale II 21 years ago
parent d52d919a29
commit 28efa96e0d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
res/res_config_odbc.c
Unescape View File

@ -410,7 +410,7 @@ static int update_odbc(const char *database, const char *table, const char *keyf
return -1; return -1;
} }
static struct ast_config *config_odbc(const char *database, const char *table, const char *file, struct ast_config *new_config_s, struct ast_category **new_cat_p, int recur) static struct ast_config *config_odbc (const char *database, const char *table, const char *file, struct ast_config *new_config_s, struct ast_category **new_cat_p, struct ast_variable **new_v_p, int recur)
{ {
struct ast_config *new; struct ast_config *new;
struct ast_variable *cur_v, *new_v; struct ast_variable *cur_v, *new_v;
@ -480,7 +480,7 @@ static struct ast_config *config_odbc(const char *database, const char *table, c
cat_started = 0; cat_started = 0;
cur_cat = *new_cat_p; cur_cat = *new_cat_p;
cur_v = NULL; cur_v = *new_v_p;
if (cur_cat) if (cur_cat)
cat_started = 1; cat_started = 1;
@ -490,7 +490,7 @@ static struct ast_config *config_odbc(const char *database, const char *table, c
while (res != SQL_NO_DATA) { while (res != SQL_NO_DATA) {
if (!strcmp (var_name, "#include") && recur < MAX_INCLUDE_LEVEL) { if (!strcmp (var_name, "#include") && recur < MAX_INCLUDE_LEVEL) {
config_odbc(database, table, var_val, new, &cur_cat, recur + 1); config_odbc(database, table, var_val, new, &cur_cat, &cur_v, recur + 1);
} else { } else {
if (strcmp (last, category) || last_cat_metric != cat_metric) { if (strcmp (last, category) || last_cat_metric != cat_metric) {
strncpy(last, category, sizeof(last) - 1); strncpy(last, category, sizeof(last) - 1);

Write Preview
Loading…
Cancel
Save