diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-22 22:13:11 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-22 22:13:11 +0000 |
| commit | a3a8a2b9dc120cccffbb20c7f3c7aacedf30cd2e (patch) | |
| tree | 4ae1df19351ad35fdd14a5dca93df8d568353c5b /res/res_config_odbc.c | |
| parent | 9c895d32faea27058bc558ad071d237ee8e6354a (diff) | |
Un-revert in preparation for actual fix
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4880 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_config_odbc.c')
| -rwxr-xr-x | res/res_config_odbc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index e487d54e1..246dd80a8 100755 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -410,7 +410,7 @@ static int update_odbc(const char *database, const char *table, const char *keyf 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, struct ast_variable **new_v_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, int recur) { struct ast_config *new; struct ast_variable *cur_v, *new_v; @@ -480,7 +480,7 @@ static struct ast_config *config_odbc (const char *database, const char *table, cat_started = 0; cur_cat = *new_cat_p; - cur_v = *new_v_p; + cur_v = NULL; if (cur_cat) cat_started = 1; @@ -490,7 +490,7 @@ static struct ast_config *config_odbc (const char *database, const char *table, while (res != SQL_NO_DATA) { if (!strcmp (var_name, "#include") && recur < MAX_INCLUDE_LEVEL) { - config_odbc(database, table, var_val, new, &cur_cat, &cur_v, recur + 1); + config_odbc(database, table, var_val, new, &cur_cat, recur + 1); } else { if (strcmp (last, category) || last_cat_metric != cat_metric) { strncpy(last, category, sizeof(last) - 1); |