make these safe against removal of the current element.

Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>

        * gdataset.c:
        (g_dataset_foreach):
        (g_datalist_foreach): make these safe against removal of the
        current element.

ChangeLog

@@ -1,3 +1,10 @@
+Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>
+
+	* gdataset.c:
+	(g_dataset_foreach):
+	(g_datalist_foreach): make these safe against removal of the
+	current element.
+
 2001-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* gmessages.c (g_log_write_prefix): change env variable to

ChangeLog.pre-2-0

@@ -1,3 +1,10 @@
+Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>
+
+	* gdataset.c:
+	(g_dataset_foreach):
+	(g_datalist_foreach): make these safe against removal of the
+	current element.
+
 2001-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* gmessages.c (g_log_write_prefix): change env variable to

ChangeLog.pre-2-10

@@ -1,3 +1,10 @@
+Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>
+
+	* gdataset.c:
+	(g_dataset_foreach):
+	(g_datalist_foreach): make these safe against removal of the
+	current element.
+
 2001-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* gmessages.c (g_log_write_prefix): change env variable to

ChangeLog.pre-2-12

@@ -1,3 +1,10 @@
+Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>
+
+	* gdataset.c:
+	(g_dataset_foreach):
+	(g_datalist_foreach): make these safe against removal of the
+	current element.
+
 2001-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* gmessages.c (g_log_write_prefix): change env variable to

ChangeLog.pre-2-2

@@ -1,3 +1,10 @@
+Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>
+
+	* gdataset.c:
+	(g_dataset_foreach):
+	(g_datalist_foreach): make these safe against removal of the
+	current element.
+
 2001-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* gmessages.c (g_log_write_prefix): change env variable to

ChangeLog.pre-2-4

@@ -1,3 +1,10 @@
+Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>
+
+	* gdataset.c:
+	(g_dataset_foreach):
+	(g_datalist_foreach): make these safe against removal of the
+	current element.
+
 2001-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* gmessages.c (g_log_write_prefix): change env variable to

ChangeLog.pre-2-6

@@ -1,3 +1,10 @@
+Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>
+
+	* gdataset.c:
+	(g_dataset_foreach):
+	(g_datalist_foreach): make these safe against removal of the
+	current element.
+
 2001-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* gmessages.c (g_log_write_prefix): change env variable to

ChangeLog.pre-2-8

@@ -1,3 +1,10 @@
+Fri May 11 18:25:23 2001  Tim Janik  <timj@gtk.org>
+
+	* gdataset.c:
+	(g_dataset_foreach):
+	(g_datalist_foreach): make these safe against removal of the
+	current element.
+
 2001-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* gmessages.c (g_log_write_prefix): change env variable to

gdataset.c

@@ -481,10 +481,13 @@ g_dataset_foreach (gconstpointer    dataset_location,
       G_UNLOCK (g_dataset_global);
       if (dataset)
 	{
-	  register GData *list;
+	  register GData *list, *next;
 	  
-	  for (list = dataset->datalist; list; list = list->next)
+	  for (list = dataset->datalist; list; list = next)
+	    {
+	      next = list->next;
 	      func (list->id, list->data, user_data);
+	    }
 	}
     }
   else
@@ -498,13 +501,16 @@ g_datalist_foreach (GData	   **datalist,
 		    GDataForeachFunc func,
 		    gpointer         user_data)
 {
-  register GData *list;
+  register GData *list, *next;
 
   g_return_if_fail (datalist != NULL);
   g_return_if_fail (func != NULL);
   
-  for (list = *datalist; list; list = list->next)
+  for (list = *datalist; list; list = next)
-    func (list->id, list->data, user_data);
+    {
+      next = list->next;
+      func (list->id, list->data, user_data);
+    }
 }
 
 void

glib/gdataset.c

@@ -481,10 +481,13 @@ g_dataset_foreach (gconstpointer    dataset_location,
       G_UNLOCK (g_dataset_global);
       if (dataset)
 	{
-	  register GData *list;
+	  register GData *list, *next;
 	  
-	  for (list = dataset->datalist; list; list = list->next)
+	  for (list = dataset->datalist; list; list = next)
+	    {
+	      next = list->next;
 	      func (list->id, list->data, user_data);
+	    }
 	}
     }
   else
@@ -498,13 +501,16 @@ g_datalist_foreach (GData	   **datalist,
 		    GDataForeachFunc func,
 		    gpointer         user_data)
 {
-  register GData *list;
+  register GData *list, *next;
 
   g_return_if_fail (datalist != NULL);
   g_return_if_fail (func != NULL);
   
-  for (list = *datalist; list; list = list->next)
+  for (list = *datalist; list; list = next)
-    func (list->id, list->data, user_data);
+    {
+      next = list->next;
+      func (list->id, list->data, user_data);
+    }
 }
 
 void