Add notes about how you shouldn't modify these data structures as you

2001-11-29  Havoc Pennington  <hp@redhat.com>

	* glib/gtree.c (g_tree_foreach):
	* glib/ghash.c (g_hash_table_foreach):

	Add notes about how you shouldn't modify these data structures as
	you iterate over them.

diff --git a/ChangeLog b/ChangeLog
index b734200..428ef55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gtree.c (g_tree_foreach):
+       * glib/ghash.c (g_hash_table_foreach): 
+
+       Add notes about how you shouldn't modify these data structures as
+       you iterate over them.
+       
 Thu Nov 29 11:16:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Update (#65721, Dave Neary)

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b734200..428ef55 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gtree.c (g_tree_foreach):
+       * glib/ghash.c (g_hash_table_foreach): 
+
+       Add notes about how you shouldn't modify these data structures as
+       you iterate over them.
+       
 Thu Nov 29 11:16:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Update (#65721, Dave Neary)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b734200..428ef55 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gtree.c (g_tree_foreach):
+       * glib/ghash.c (g_hash_table_foreach): 
+
+       Add notes about how you shouldn't modify these data structures as
+       you iterate over them.
+       
 Thu Nov 29 11:16:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Update (#65721, Dave Neary)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b734200..428ef55 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gtree.c (g_tree_foreach):
+       * glib/ghash.c (g_hash_table_foreach): 
+
+       Add notes about how you shouldn't modify these data structures as
+       you iterate over them.
+       
 Thu Nov 29 11:16:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Update (#65721, Dave Neary)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b734200..428ef55 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gtree.c (g_tree_foreach):
+       * glib/ghash.c (g_hash_table_foreach): 
+
+       Add notes about how you shouldn't modify these data structures as
+       you iterate over them.
+       
 Thu Nov 29 11:16:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Update (#65721, Dave Neary)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b734200..428ef55 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gtree.c (g_tree_foreach):
+       * glib/ghash.c (g_hash_table_foreach): 
+
+       Add notes about how you shouldn't modify these data structures as
+       you iterate over them.
+       
 Thu Nov 29 11:16:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Update (#65721, Dave Neary)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b734200..428ef55 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gtree.c (g_tree_foreach):
+       * glib/ghash.c (g_hash_table_foreach): 
+
+       Add notes about how you shouldn't modify these data structures as
+       you iterate over them.
+       
 Thu Nov 29 11:16:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Update (#65721, Dave Neary)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b734200..428ef55 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-11-29  Havoc Pennington  <hp@redhat.com>
+
+       * glib/gtree.c (g_tree_foreach):
+       * glib/ghash.c (g_hash_table_foreach): 
+
+       Add notes about how you shouldn't modify these data structures as
+       you iterate over them.
+       
 Thu Nov 29 11:16:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Update (#65721, Dave Neary)

diff --git a/docs/reference/glib/tmpl/patterns.sgml b/docs/reference/glib/tmpl/patterns.sgml
index bbf1364..d3de5db 100644 (file)
--- a/docs/reference/glib/tmpl/patterns.sgml
+++ b/docs/reference/glib/tmpl/patterns.sgml
@@ -37,6 +37,10 @@ A <structname>GPatternSpec</structname> is the 'compiled' form of a pattern.
 This structure is opaque and its fields cannot be accessed directly.
 </para>
 
+@match_type: 
+@pattern_length: 
+@pattern: 
+@pattern_reversed: 
 
 <!-- ##### FUNCTION g_pattern_spec_new ##### -->
 <para>

diff --git a/docs/reference/glib/tmpl/unicode.sgml b/docs/reference/glib/tmpl/unicode.sgml
index b9811a6..b9edb0d 100644 (file)
--- a/docs/reference/glib/tmpl/unicode.sgml
+++ b/docs/reference/glib/tmpl/unicode.sgml
@@ -46,8 +46,9 @@ A type which can hold any UTF-16 character code.
 
 </para>
 
-@charset: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@charset: 
 
 
 <!-- ##### FUNCTION g_unichar_validate ##### -->

diff --git a/glib/ghash.c b/glib/ghash.c
index 40be7d3..2a121d7 100644 (file)
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -536,9 +536,12 @@ g_hash_table_foreach_remove_or_steal (GHashTable *hash_table,
  * @func: the function to call for each key/value pair.
  * @user_data: user data to pass to the function.
  * 
- * Calls the given function for each of the key/value pairs in the #GHashTable.
- * The function is passed the key and value of each pair, and the given
- * @user_data parameter.
+ * Calls the given function for each of the key/value pairs in the
+ * #GHashTable.  The function is passed the key and value of each
+ * pair, and the given @user_data parameter.  The hash table may not
+ * be modified while iterating over it (you can't add/remove
+ * items). To remove all items matching a predicate, use
+ * g_hash_table_remove().
  **/
 void
 g_hash_table_foreach (GHashTable *hash_table,

diff --git a/glib/gtree.c b/glib/gtree.c
index 96a1b34..0546246 100644 (file)
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -442,7 +442,11 @@ g_tree_lookup_extended (GTree         *tree,
  * 
  * Calls the given function for each of the key/value pairs in the #GTree.
  * The function is passed the key and value of each pair, and the given
- * @data parameter.
+ * @data parameter. The tree may not be modified while iterating over
+ * it (you can't add/remove items). To remove all items matching
+ * a predicate, you need to add each item to a list as in your
+ * #GTraverseFunc as you walk over the tree, then walk the list
+ * and remove each item.
  **/
 void
 g_tree_foreach (GTree         *tree,