in case we have to abort the program, debugging is enabled and we are not

[platform/upstream/glib.git] / gtree.c

diff --git a/gtree.c b/gtree.c
index 006f15d..557aa27 100644 (file)
--- a/gtree.c
+++ b/gtree.c
@@ -17,6 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/*
+ * Modified by the GLib Team and others 1997-1999.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 /* 
  * MT safe
  */
@@ -83,7 +90,7 @@ static GTreeNode* g_tree_node_rotate_right          (GTreeNode      *node);
 static void       g_tree_node_check                 (GTreeNode      *node);
 
 
-static G_LOCK_DEFINE(g_tree_global);
+G_LOCK_DEFINE_STATIC (g_tree_global);
 static GMemChunk *node_mem_chunk = NULL;
 static GTreeNode *node_free_list = NULL;
 
@@ -94,7 +101,7 @@ g_tree_node_new (gpointer key,
 {
   GTreeNode *node;
 
-  g_lock (g_tree_global);
+  G_LOCK (g_tree_global);
   if (node_free_list)
     {
       node = node_free_list;
@@ -110,7 +117,7 @@ g_tree_node_new (gpointer key,
 
       node = g_chunk_new (GTreeNode, node_mem_chunk);
    }
-  g_unlock (g_tree_global);
+  G_UNLOCK (g_tree_global);
 
   node->balance = 0;
   node->left = NULL;
@@ -128,10 +135,10 @@ g_tree_node_destroy (GTreeNode *node)
     {
       g_tree_node_destroy (node->right);
       g_tree_node_destroy (node->left);
-      g_lock (g_tree_global);
+      G_LOCK (g_tree_global);
       node->right = node_free_list;
       node_free_list = node;
-      g_unlock (g_tree_global);
+      G_UNLOCK (g_tree_global);
    }
 }
 
@@ -218,7 +225,8 @@ g_tree_traverse (GTree         *tree,
 
   rtree = (GRealTree*) tree;
 
-  g_return_if_fail (rtree->root != NULL);
+  if (!rtree->root)
+    return;
 
   switch (traverse_type)
     {
@@ -253,7 +261,8 @@ g_tree_search (GTree       *tree,
 
   if (rtree->root)
     return g_tree_node_search (rtree->root, search_func, data);
-  return NULL;
+  else
+    return NULL;
 }
 
 gint
@@ -267,7 +276,8 @@ g_tree_height (GTree *tree)
 
   if (rtree->root)
     return g_tree_node_height (rtree->root);
-  return 0;
+  else
+    return 0;
 }
 
 gint
@@ -281,7 +291,8 @@ g_tree_nnodes (GTree *tree)
 
   if (rtree->root)
     return g_tree_node_count (rtree->root);
-  return 0;
+  else
+    return 0;
 }
 
 static GTreeNode*
@@ -385,10 +396,10 @@ g_tree_node_remove (GTreeNode    *node,
          node = g_tree_node_restore_right_balance (new_root, old_balance);
        }
 
-      g_lock (g_tree_global);
+      G_LOCK (g_tree_global);
       garbage->right = node_free_list;
       node_free_list = garbage;
-      g_unlock (g_tree_global);
+      G_UNLOCK (g_tree_global);
    }
   else if (cmp < 0)
     {