osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

core/rbtree: add const qualifier to some functions 

See kernel commit f4b477c47332367d35686bd2b808c2156b96d7c7

----
The 'rb_first()', 'rb_last()', 'rb_next()' and 'rb_prev()' calls
take a pointer to an RB node or RB root. They do not change the
pointed objects, so add a 'const' qualifier in order to make life
of the users of these functions easier.

Indeed, if I have my own constant pointer &const struct my_type *p,
and I call 'rb_next(&p->rb)', I get a GCC warning:

warning: passing argument 1 of ?~@~Xrb_next?~@~Y discards qualifiers from pointer target type

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2011-11-11 15:32:57 +01:00 committed by Harald Welte
parent e55ae3ae1c
commit 2179f402e0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/osmocom/core/linuxrbtree.h
View File

@ -139,10 +139,10 @@ extern void rb_insert_color(struct rb_node *, struct rb_root *);
extern void rb_erase(struct rb_node *, struct rb_root *);
/* Find logical next and previous nodes in a tree */
extern struct rb_node *rb_next(struct rb_node *);
extern struct rb_node *rb_prev(struct rb_node *);
extern struct rb_node *rb_first(struct rb_root *);
extern struct rb_node *rb_last(struct rb_root *);
extern struct rb_node *rb_next(const struct rb_node *);
extern struct rb_node *rb_prev(const struct rb_node *);
extern struct rb_node *rb_first(const struct rb_root *);
extern struct rb_node *rb_last(const struct rb_root *);
/* Fast replacement of a single node without remove/rebalance/add/rebalance */
extern void rb_replace_node(struct rb_node *victim, struct rb_node *new,

12
src/rbtree.c
View File

@ -289,7 +289,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
/*
* This function returns the first node (in sort order) of the tree.
*/
struct rb_node *rb_first(struct rb_root *root)
struct rb_node *rb_first(const struct rb_root *root)
{
struct rb_node *n;
@ -301,7 +301,7 @@ struct rb_node *rb_first(struct rb_root *root)
return n;
}
struct rb_node *rb_last(struct rb_root *root)
struct rb_node *rb_last(const struct rb_root *root)
{
struct rb_node *n;
@ -313,7 +313,7 @@ struct rb_node *rb_last(struct rb_root *root)
return n;
}
struct rb_node *rb_next(struct rb_node *node)
struct rb_node *rb_next(const struct rb_node *node)
{
struct rb_node *parent;
@ -326,7 +326,7 @@ struct rb_node *rb_next(struct rb_node *node)
node = node->rb_right;
while (node->rb_left)
node=node->rb_left;
return node;
return (struct rb_node *)node;
}
/* No right-hand children. Everything down and left is
@ -341,7 +341,7 @@ struct rb_node *rb_next(struct rb_node *node)
return parent;
}
struct rb_node *rb_prev(struct rb_node *node)
struct rb_node *rb_prev(const struct rb_node *node)
{
struct rb_node *parent;
@ -354,7 +354,7 @@ struct rb_node *rb_prev(struct rb_node *node)
node = node->rb_left;
while (node->rb_right)
node=node->rb_right;
return node;
return (struct rb_node *)node;
}
/* No left-hand children. Go up till we find an ancestor which