summaryrefslogtreecommitdiff
path: root/gtree.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1999-01-17 16:56:28 +0000
committerTim Janik <timj@src.gnome.org>1999-01-17 16:56:28 +0000
commit6db5c264f96cdbf14c521099ef03f10927c8d998 (patch)
treec1b0548ea3b4c8df80be163bae9b6d94de7fb35a /gtree.c
parent48763aea23a995b8d1af15d931c99baa49b24879 (diff)
removed assertment about rtree->root being NULL, so this function can be
Sun Jan 17 17:15:59 1999 Tim Janik <timj@gtk.org> * gtree.c (g_tree_traverse): removed assertment about rtree->root being NULL, so this function can be applied to unpopulated trees as well, fix provided by Simon Kagedal <sika8225@csd.uu.se>.
Diffstat (limited to 'gtree.c')
-rw-r--r--gtree.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/gtree.c b/gtree.c
index 0fbf62f80..5b4e342bb 100644
--- a/gtree.c
+++ b/gtree.c
@@ -218,7 +218,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 +254,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 +269,8 @@ g_tree_height (GTree *tree)
if (rtree->root)
return g_tree_node_height (rtree->root);
- return 0;
+ else
+ return 0;
}
gint
@@ -281,7 +284,8 @@ g_tree_nnodes (GTree *tree)
if (rtree->root)
return g_tree_node_count (rtree->root);
- return 0;
+ else
+ return 0;
}
static GTreeNode*