luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-10 11:14:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

I'm stupid and managed to screw up my own patch. Now the new function

Browse Source 
works as advertised.


--Sven
This commit is contained in:
Sven Neumann
2001-03-08 18:18:16 +00:00
parent e71a64bc86
commit 8e936594e6
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
glib/gtree.c
View File

@@ -75,7 +75,7 @@ static GTreeNode* g_tree_node_restore_left_balance (GTreeNode *node,
gint old_balance); gint old_balance);
static GTreeNode* g_tree_node_restore_right_balance (GTreeNode *node, static GTreeNode* g_tree_node_restore_right_balance (GTreeNode *node,
gint old_balance); gint old_balance);
static gpointer g_tree_node_lookup (GTreeNode *node, static GTreeNode* g_tree_node_lookup (GTreeNode *node,
GCompareDataFunc compare, GCompareDataFunc compare,
gpointer comp_data, gpointer comp_data,
gconstpointer key); gconstpointer key);
@@ -229,13 +229,16 @@ g_tree_lookup (GTree *tree,
gconstpointer key) gconstpointer key)
{ {
GRealTree *rtree; GRealTree *rtree;
GTreeNode *node;
g_return_val_if_fail (tree != NULL, NULL); g_return_val_if_fail (tree != NULL, NULL);
rtree = (GRealTree*) tree; rtree = (GRealTree*) tree;
return g_tree_node_lookup (rtree->root, rtree->key_compare, node = g_tree_node_lookup (rtree->root, rtree->key_compare,
rtree->key_compare_data, key); rtree->key_compare_data, key);
return node ? node->value : NULL;
} }
gboolean gboolean
@@ -554,7 +557,7 @@ g_tree_node_restore_right_balance (GTreeNode *node,
return node; return node;
} }
static gpointer static GTreeNode *
g_tree_node_lookup (GTreeNode *node, g_tree_node_lookup (GTreeNode *node,
GCompareDataFunc compare, GCompareDataFunc compare,
gpointer compare_data, gpointer compare_data,
@@ -567,7 +570,7 @@ g_tree_node_lookup (GTreeNode *node,
cmp = (* compare) (key, node->key, compare_data); cmp = (* compare) (key, node->key, compare_data);
if (cmp == 0) if (cmp == 0)
return node->value; return node;
if (cmp < 0) if (cmp < 0)
{ {

11
gtree.c
View File

@@ -75,7 +75,7 @@ static GTreeNode* g_tree_node_restore_left_balance (GTreeNode *node,
gint old_balance); gint old_balance);
static GTreeNode* g_tree_node_restore_right_balance (GTreeNode *node, static GTreeNode* g_tree_node_restore_right_balance (GTreeNode *node,
gint old_balance); gint old_balance);
static gpointer g_tree_node_lookup (GTreeNode *node, static GTreeNode* g_tree_node_lookup (GTreeNode *node,
GCompareDataFunc compare, GCompareDataFunc compare,
gpointer comp_data, gpointer comp_data,
gconstpointer key); gconstpointer key);
@@ -229,13 +229,16 @@ g_tree_lookup (GTree *tree,
gconstpointer key) gconstpointer key)
{ {
GRealTree *rtree; GRealTree *rtree;
GTreeNode *node;
g_return_val_if_fail (tree != NULL, NULL); g_return_val_if_fail (tree != NULL, NULL);
rtree = (GRealTree*) tree; rtree = (GRealTree*) tree;
return g_tree_node_lookup (rtree->root, rtree->key_compare, node = g_tree_node_lookup (rtree->root, rtree->key_compare,
rtree->key_compare_data, key); rtree->key_compare_data, key);
return node ? node->value : NULL;
} }
gboolean gboolean
@@ -554,7 +557,7 @@ g_tree_node_restore_right_balance (GTreeNode *node,
return node; return node;
} }
static gpointer static GTreeNode *
g_tree_node_lookup (GTreeNode *node, g_tree_node_lookup (GTreeNode *node,
GCompareDataFunc compare, GCompareDataFunc compare,
gpointer compare_data, gpointer compare_data,
@@ -567,7 +570,7 @@ g_tree_node_lookup (GTreeNode *node,
cmp = (* compare) (key, node->key, compare_data); cmp = (* compare) (key, node->key, compare_data);
if (cmp == 0) if (cmp == 0)
return node->value; return node;
if (cmp < 0) if (cmp < 0)
{ {