mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-03 20:38:59 +00:00 
			
		
		
		
	repeal config prototype changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		@@ -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, 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_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;
 | 
			
		||||
 | 
			
		||||
		cur_cat = *new_cat_p;
 | 
			
		||||
		cur_v = NULL;
 | 
			
		||||
		cur_v = *new_v_p;
 | 
			
		||||
 | 
			
		||||
		if (cur_cat)
 | 
			
		||||
			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) {
 | 
			
		||||
			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 {
 | 
			
		||||
				if (strcmp (last, category) || last_cat_metric != cat_metric) {
 | 
			
		||||
					strncpy(last, category, sizeof(last) - 1);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user