diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-04-12 21:22:34 +0200 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-04-12 22:10:38 +0200 |
| commit | 5bcf3ba72a7d54625b3996cefb05dba0aae6da42 (patch) | |
| tree | 1d5bc87fca1676d91d393ef72456ea84f188361b /gtk/gtkrbtree.c | |
| parent | 3e5d49f52bacab047e7a36bb5329f84ba6c5fd1a (diff) | |
| download | gtk+-5bcf3ba72a7d54625b3996cefb05dba0aae6da42.tar.gz | |
Fix compilation warning: move function to proper location
Move _count_nodes() auxiliar function inside the
G_ENABLE_DEBUG define, where other auxiliar functions are.
Diffstat (limited to 'gtk/gtkrbtree.c')
| -rw-r--r-- | gtk/gtkrbtree.c | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c index 207c2a80eb..c33a9edcfe 100644 --- a/gtk/gtkrbtree.c +++ b/gtk/gtkrbtree.c @@ -33,8 +33,6 @@ static void _gtk_rbtree_insert_fixup (GtkRBTree *tree, GtkRBNode *node); static void _gtk_rbtree_remove_node_fixup (GtkRBTree *tree, GtkRBNode *node); -static gint _count_nodes (GtkRBTree *tree, - GtkRBNode *node); static inline void _fixup_validation (GtkRBTree *tree, GtkRBNode *node); static inline void _fixup_parity (GtkRBTree *tree, @@ -1469,25 +1467,6 @@ _gtk_rbtree_traverse (GtkRBTree *tree, } } -static gint -_count_nodes (GtkRBTree *tree, - GtkRBNode *node) -{ - gint res; - if (node == tree->nil) - return 0; - - g_assert (node->left); - g_assert (node->right); - - res = (_count_nodes (tree, node->left) + - _count_nodes (tree, node->right) + 1); - - if (res != node->count) - g_print ("Tree failed\n"); - return res; -} - static inline void _fixup_validation (GtkRBTree *tree, GtkRBNode *node) @@ -1572,6 +1551,25 @@ count_parity (GtkRBTree *tree, return res; } +static gint +_count_nodes (GtkRBTree *tree, + GtkRBNode *node) +{ + gint res; + if (node == tree->nil) + return 0; + + g_assert (node->left); + g_assert (node->right); + + res = (_count_nodes (tree, node->left) + + _count_nodes (tree, node->right) + 1); + + if (res != node->count) + g_print ("Tree failed\n"); + return res; +} + static void _gtk_rbtree_test_height (GtkRBTree *tree, GtkRBNode *node) @@ -1677,7 +1675,7 @@ _gtk_rbtree_test_structure (GtkRBTree *tree) g_assert (tree->root->parent == tree->nil); _gtk_rbtree_test_structure_helper (tree, tree->root); } - + void _gtk_rbtree_test (const gchar *where, GtkRBTree *tree) |