diff options
| author |   dlg <dlg@openbsd.org> | 2016-09-15 05:21:09 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2016-09-15 05:21:09 +0000 |
| commit | 51f4a8279df8c6eddeefadac3a382572c9d0a3e5 (patch) | |
| tree | 605a948a984ad877f765c15894688c9f4aa5d09f | |
| parent | RBT_NEXT, PREV, LEFT, RIGHT, and PARENT take an element, not a tree. (diff) | |
| download | wireguard-openbsd-51f4a8279df8c6eddeefadac3a382572c9d0a3e5.tar.xz wireguard-openbsd-51f4a8279df8c6eddeefadac3a382572c9d0a3e5.zip | |
rename the members of rb_entry so they dont keep working with RB macros
| -rw-r--r-- | sys/kern/subr_tree.c | 8 | ||||
| -rw-r--r-- | sys/sys/tree.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/subr_tree.c b/sys/kern/subr_tree.c index 4c2ba48a14d..03103a1d077 100644 --- a/sys/kern/subr_tree.c +++ b/sys/kern/subr_tree.c @@ -60,10 +60,10 @@ rb_e2n(const struct rb_type *t, struct rb_entry *rbe) return ((void *)(addr - t->t_offset)); } -#define RBE_LEFT(_rbe) (_rbe)->rbe_left -#define RBE_RIGHT(_rbe) (_rbe)->rbe_right -#define RBE_PARENT(_rbe) (_rbe)->rbe_parent -#define RBE_COLOR(_rbe) (_rbe)->rbe_color +#define RBE_LEFT(_rbe) (_rbe)->rbt_left +#define RBE_RIGHT(_rbe) (_rbe)->rbt_right +#define RBE_PARENT(_rbe) (_rbe)->rbt_parent +#define RBE_COLOR(_rbe) (_rbe)->rbt_color #define RBH_ROOT(_rbt) (_rbt)->rbt_root diff --git a/sys/sys/tree.h b/sys/sys/tree.h index 3eb354f1b21..34d97739544 100644 --- a/sys/sys/tree.h +++ b/sys/sys/tree.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.h,v 1.22 2016/09/15 01:05:15 dlg Exp $ */ +/* $OpenBSD: tree.h,v 1.23 2016/09/15 05:21:09 dlg Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -775,10 +775,10 @@ struct rb_tree { }; struct rb_entry { - struct rb_entry *rbe_parent; - struct rb_entry *rbe_left; - struct rb_entry *rbe_right; - unsigned int rbe_color; + struct rb_entry *rbt_parent; + struct rb_entry *rbt_left; + struct rb_entry *rbt_right; + unsigned int rbt_color; }; #define RBT_HEAD(_name, _type) \ |