diff options
author | Mark Spencer <markster@digium.com> | 2005-01-22 22:13:11 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2005-01-22 22:13:11 +0000 |
commit | 17c311c9b90e95ee4326f8f1625a2af4e0fbdc03 (patch) | |
tree | 4ae1df19351ad35fdd14a5dca93df8d568353c5b /res/res_config_odbc.c | |
parent | 28efa96e0d4b3171693aed54faa43f0e60baade4 (diff) |
Un-revert in preparation for actual fix
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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); |