[Asterisk-cvs] asterisk-addons res_config_mysql.c,1.4,1.5

[anthm at lists.digium.com]

Update of /usr/cvsroot/asterisk-addons
In directory mongoose.digium.com:/tmp/cvs-serv32277

Modified Files:
	res_config_mysql.c 
Log Message:
repeal config prototype changes

Index: res_config_mysql.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/res_config_mysql.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- res_config_mysql.c	21 Jan 2005 01:43:19 -0000	1.4
+++ res_config_mysql.c	22 Jan 2005 21:09:56 -0000	1.5
@@ -344,7 +344,7 @@
 	return -1;
 }
 
-static struct ast_config *config_mysql(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_mysql(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)
 {
 	MYSQL_RES *result;
 	MYSQL_ROW row;
@@ -402,7 +402,7 @@
 		cat_started = 0;
 
 		cur_cat = *new_cat_p;
-		cur_v = NULL;
+		cur_v = *new_v_p;
 
 		if(cur_cat) {
 			cat_started = 1;
@@ -417,7 +417,7 @@
 
 		while((row = mysql_fetch_row(result))) {
 			if(!strcmp(row[1], "#include") && recur < MAX_INCLUDE_LEVEL) {
-				config_mysql(database, table, row[2], new, &cur_cat, recur + 1);
+				config_mysql(database, table, row[2], new, &cur_cat, &cur_v, recur + 1);
 			} else {
 				if(strcmp(last, row[0]) || last_cat_metric != atoi(row[3])) {
 					strncpy(last, row[0], sizeof(last) - 1);