diff -Nru a/channel.c b/channel.c
--- a/channel.c	2004-12-22 21:53:04 -07:00
+++ b/channel.c	2004-12-22 21:53:04 -07:00
@@ -641,8 +641,7 @@
 	/* no need to lock the list, as the channel is already locked */
 	
 	while (!AST_LIST_EMPTY(headp)) {           /* List Deletion. */
-	            vardata = AST_LIST_FIRST(headp);
-	            AST_LIST_REMOVE_HEAD(headp, entries);
+	            vardata = AST_LIST_REMOVE_HEAD(headp, ast_var_t, entries);
 /*	            printf("deleting var %s=%s\n",ast_var_name(vardata),ast_var_value(vardata)); */
 	            ast_var_delete(vardata);
 	}
diff -Nru a/doc/linkedlists.README b/doc/linkedlists.README
--- a/doc/linkedlists.README	2004-12-22 21:53:04 -07:00
+++ b/doc/linkedlists.README	2004-12-22 21:53:04 -07:00
@@ -48,9 +48,10 @@
 
 	AST_LIST_REMOVE(headp,node1,ast_var_t,listpointers);
 
-AST_LIST_REMOVE_HEAD removes the entry at the head of the list: 
+AST_LIST_REMOVE_HEAD removes the entry at the head of the list and
+returns a pointer to the removed entry: 
 
-	AST_LIST_REMOVE(headp,listpointers);
+	AST_LIST_REMOVE_HEAD(headp,node,listpointers);
 
 AST_LIST_FIRST returns a pointer to the first element of the list;
 
@@ -78,8 +79,7 @@
 	struct ast_var_t *vardata;
 
         while (!AST_LIST_EMPTY(headp)) {           /* List Deletion. */
-                    vardata = AST_LIST_FIRST(head);
-                    AST_LIST_REMOVE_HEAD(head, listpointers);
+                    vardata = AST_LIST_REMOVE_HEAD(head, ast_var_t, listpointers);
                     free(vardata->name);
 		    free(vardata->value);
         }
diff -Nru a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
--- a/include/asterisk/linkedlists.h	2004-12-22 21:53:04 -07:00
+++ b/include/asterisk/linkedlists.h	2004-12-22 21:53:04 -07:00
@@ -62,13 +62,15 @@
 } while (0)
 
 
-#define AST_LIST_REMOVE_HEAD(head, field) do {					\
+#define AST_LIST_REMOVE_HEAD(head, type, field) ({				\
+		struct type *cur = (head)->first;				\
 		(head)->first = (head)->first->field.next;			\
-	} while (0)
+		cur;								\
+	})
 
 #define AST_LIST_REMOVE(head, elm, type, field) do {			\
 	if ((head)->first == (elm)) {					\
-		AST_LIST_REMOVE_HEAD((head), field);			\
+		AST_LIST_REMOVE_HEAD((head), type, field);		\
 	}								\
 	else {								\
 		struct type *curelm = (head)->first;			\
diff -Nru a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
--- a/pbx/pbx_dundi.c	2004-12-22 21:53:04 -07:00
+++ b/pbx/pbx_dundi.c	2004-12-22 21:53:04 -07:00
@@ -551,8 +551,7 @@
 				AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
 				pbx_substitute_variables_varshead(&headp, map->dest, dr[anscnt].dest, sizeof(dr[anscnt].dest));
 				while (!AST_LIST_EMPTY(&headp)) {           /* List Deletion. */
-					newvariable = AST_LIST_FIRST(&headp);
-					AST_LIST_REMOVE_HEAD(&headp, entries);
+					newvariable = AST_LIST_REMOVE_HEAD(&headp, ast_var_t, entries);
 					ast_var_delete(newvariable);
 				}
 			} else
diff -Nru a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
--- a/pbx/pbx_loopback.c	2004-12-22 21:53:04 -07:00
+++ b/pbx/pbx_loopback.c	2004-12-22 21:53:04 -07:00
@@ -81,8 +81,7 @@
 	pbx_substitute_variables_varshead(&headp, data, buf, buflen);
 	/* Substitute variables */
 	while (!AST_LIST_EMPTY(&headp)) {           /* List Deletion. */
-		newvariable = AST_LIST_FIRST(&headp);
-		AST_LIST_REMOVE_HEAD(&headp, entries);
+		newvariable = AST_LIST_REMOVE_HEAD(&headp, ast_var_t, entries);
 		ast_var_delete(newvariable);
 	}
 	return buf;
diff -Nru a/pbx.c b/pbx.c
--- a/pbx.c	2004-12-22 21:53:04 -07:00
+++ b/pbx.c	2004-12-22 21:53:04 -07:00
@@ -5123,8 +5123,7 @@
 {
 	struct ast_var_t *vardata;
 	while (!AST_LIST_EMPTY(&globals)) {
-		vardata = AST_LIST_FIRST(&globals);
-		AST_LIST_REMOVE_HEAD(&globals, entries);
+		vardata = AST_LIST_REMOVE_HEAD(&globals, ast_var_t, entries);
 		ast_var_delete(vardata);
 	}
 }