[Asterisk-cvs] asterisk channel.c,1.156,1.157 pbx.c,1.193,1.194

[markster at lists.digium.com]

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

Modified Files:
	channel.c pbx.c 
Log Message:
List improvements from kpfleming (bugs #3166,#3140)


Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- channel.c	1 Jan 2005 20:17:11 -0000	1.156
+++ channel.c	1 Jan 2005 21:26:37 -0000	1.157
@@ -673,7 +673,7 @@
 	/* no need to lock the list, as the channel is already locked */
 	
 	while (!AST_LIST_EMPTY(headp)) {           /* List Deletion. */
-	            vardata = AST_LIST_REMOVE_HEAD(headp, ast_var_t, entries);
+	            vardata = AST_LIST_REMOVE_HEAD(headp, entries);
 /*	            printf("deleting var %s=%s\n",ast_var_name(vardata),ast_var_value(vardata)); */
 	            ast_var_delete(vardata);
 	}

Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- pbx.c	31 Dec 2004 00:37:55 -0000	1.193
+++ pbx.c	1 Jan 2005 21:26:37 -0000	1.194
@@ -5052,7 +5052,7 @@
 	AST_LIST_TRAVERSE (headp, newvariable, entries) {
 		if (strcasecmp(ast_var_name(newvariable), name) == 0) {
 			/* there is already such a variable, delete it */
-			AST_LIST_REMOVE(headp, newvariable, ast_var_t, entries);
+			AST_LIST_REMOVE(headp, newvariable, entries);
 			ast_var_delete(newvariable);
 			break;
 		}
@@ -5155,7 +5155,7 @@
 {
 	struct ast_var_t *vardata;
 	while (!AST_LIST_EMPTY(&globals)) {
-		vardata = AST_LIST_REMOVE_HEAD(&globals, ast_var_t, entries);
+		vardata = AST_LIST_REMOVE_HEAD(&globals, entries);
 		ast_var_delete(vardata);
 	}
 }