callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation warning: move function to proper location

Browse Source 
Move _count_nodes() auxiliar function inside the
G_ENABLE_DEBUG define, where other auxiliar functions are.
This commit is contained in:
Javier Jardón
2010-04-12 21:22:34 +02:00
parent 3e5d49f52b
commit 5bcf3ba72a
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtkrbtree.c
View File

@ -33,8 +33,6 @@ static void _gtk_rbtree_insert_fixup (GtkRBTree *tree,
GtkRBNode *node); GtkRBNode *node);
static void _gtk_rbtree_remove_node_fixup (GtkRBTree *tree, static void _gtk_rbtree_remove_node_fixup (GtkRBTree *tree,
GtkRBNode *node); GtkRBNode *node);
static gint _count_nodes (GtkRBTree *tree,
GtkRBNode *node);
static inline void _fixup_validation (GtkRBTree *tree, static inline void _fixup_validation (GtkRBTree *tree,
GtkRBNode *node); GtkRBNode *node);
static inline void _fixup_parity (GtkRBTree *tree, 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 static inline
void _fixup_validation (GtkRBTree *tree, void _fixup_validation (GtkRBTree *tree,
GtkRBNode *node) GtkRBNode *node)
@ -1572,6 +1551,25 @@ count_parity (GtkRBTree *tree,
return res; 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 static void
_gtk_rbtree_test_height (GtkRBTree *tree, _gtk_rbtree_test_height (GtkRBTree *tree,
GtkRBNode *node) GtkRBNode *node)
@ -1677,7 +1675,7 @@ _gtk_rbtree_test_structure (GtkRBTree *tree)
g_assert (tree->root->parent == tree->nil); g_assert (tree->root->parent == tree->nil);
_gtk_rbtree_test_structure_helper (tree, tree->root); _gtk_rbtree_test_structure_helper (tree, tree->root);
} }
void void
_gtk_rbtree_test (const gchar *where, _gtk_rbtree_test (const gchar *where,
GtkRBTree *tree) GtkRBTree *tree)