summaryrefslogtreecommitdiffstats
path: root/sys/sys/tree.h
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2004-03-29 11:18:25 +0000
committerdes <des@FreeBSD.org>2004-03-29 11:18:25 +0000
commit46ece38451dd2142340756e3fc952c39e746bc5b (patch)
treeac09560f722de9fe107294ddd552faf09abe9bcb /sys/sys/tree.h
parent6699cb74fc44609e18be3f9d4b861cf903730253 (diff)
downloadFreeBSD-src-46ece38451dd2142340756e3fc952c39e746bc5b.zip
FreeBSD-src-46ece38451dd2142340756e3fc952c39e746bc5b.tar.gz
Synch with NetBSD: avoid "unused parameter" warning.
Diffstat (limited to 'sys/sys/tree.h')
-rw-r--r--sys/sys/tree.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index 0c4e5ae..5648e464 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.h,v 1.7 2004/01/24 21:59:47 dbj Exp $ */
+/* $NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $ */
/* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -380,7 +380,7 @@ void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
struct type *name##_RB_REMOVE(struct name *, struct type *); \
struct type *name##_RB_INSERT(struct name *, struct type *); \
struct type *name##_RB_FIND(struct name *, struct type *); \
-struct type *name##_RB_NEXT(struct name *, struct type *); \
+struct type *name##_RB_NEXT(struct type *); \
struct type *name##_RB_MINMAX(struct name *, int); \
\
@@ -628,7 +628,7 @@ name##_RB_FIND(struct name *head, struct type *elm) \
\
/* ARGSUSED */ \
struct type * \
-name##_RB_NEXT(struct name *head, struct type *elm) \
+name##_RB_NEXT(struct type *elm) \
{ \
if (RB_RIGHT(elm, field)) { \
elm = RB_RIGHT(elm, field); \
@@ -669,13 +669,13 @@ name##_RB_MINMAX(struct name *head, int val) \
#define RB_INSERT(name, x, y) name##_RB_INSERT(x, y)
#define RB_REMOVE(name, x, y) name##_RB_REMOVE(x, y)
#define RB_FIND(name, x, y) name##_RB_FIND(x, y)
-#define RB_NEXT(name, x, y) name##_RB_NEXT(x, y)
+#define RB_NEXT(name, x, y) name##_RB_NEXT(y)
#define RB_MIN(name, x) name##_RB_MINMAX(x, RB_NEGINF)
#define RB_MAX(name, x) name##_RB_MINMAX(x, RB_INF)
#define RB_FOREACH(x, name, head) \
for ((x) = RB_MIN(name, head); \
(x) != NULL; \
- (x) = name##_RB_NEXT(head, x))
+ (x) = name##_RB_NEXT(x))
#endif /* _SYS_TREE_H_ */
OpenPOWER on IntegriCloud