From 6db5c264f96cdbf14c521099ef03f10927c8d998 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 17 Jan 1999 16:56:28 +0000 Subject: removed assertment about rtree->root being NULL, so this function can be Sun Jan 17 17:15:59 1999 Tim Janik * 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 . --- glib/gtree.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'glib') diff --git a/glib/gtree.c b/glib/gtree.c index 0fbf62f80..5b4e342bb 100644 --- a/glib/gtree.c +++ b/glib/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* -- cgit v1.2.3