From 615c18070035f277408e252c981f125e007e27fc Mon Sep 17 00:00:00 2001 From: Timo Kokkonen Date: Mon, 5 Apr 2010 16:14:40 +0300 Subject: [PATCH] quadtree: Suppress compiler warnings Signed-off-by: Timo Kokkonen --- quadtree.c | 5 ++--- quadtree.h | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/quadtree.c b/quadtree.c index b173c3e..b734c84 100644 --- a/quadtree.c +++ b/quadtree.c @@ -1,4 +1,5 @@ #include +#include #include "quadtree.h" @@ -43,10 +44,8 @@ static void validate_subtree(const struct quadtree *node) static void validate_tree(const struct quadtree *node) { - const struct quadtree *parent = quadtree_find_parent(node); - if (debug) - validate_subtree(parent); + validate_subtree(quadtree_find_parent(node)); } /** diff --git a/quadtree.h b/quadtree.h index 2e4a76b..4204116 100644 --- a/quadtree.h +++ b/quadtree.h @@ -42,12 +42,13 @@ int walk_tree(const struct quadtree_iterator *iterator); /* quadtree_find_parent - return the highest parent of the node */ -static inline struct quadtree *quadtree_find_parent(struct quadtree *node) +static inline struct quadtree *quadtree_find_parent(const struct quadtree *node) { - while (node->parent) - node = node->parent; + struct quadtree *t = (struct quadtree *)node; + while (t->parent) + t = t->parent; - return node; + return t; } #endif -- 2.45.0