aboutsummaryrefslogtreecommitdiffstats
path: root/res/res_config_odbc.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-01-16 22:58:44 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-01-16 22:58:44 +0000
commitd8b31ce4ced6db8c93171133f5d97bc1a39bbed3 (patch)
treef0a5c966bac9c5434d7f267613a6c4a42e3a737f /res/res_config_odbc.c
parent5cda10d8e33f8fa023301bb9ff7b0f94b3a9092e (diff)
Fix static db problem
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4813 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_config_odbc.c')
-rwxr-xr-xres/res_config_odbc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 485a792e7..2a27c06a2 100755
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -407,7 +407,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;
@@ -477,7 +477,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;
@@ -487,7 +487,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);