From: djm <djm>
Date: Fri, 26 Oct 2007 06:37:43 +0000 (+0000)
Subject:    - frantzen@@cvs.openbsd.org 2004/04/24 18:11:46
X-Git-Tag: V_4_9_P1~121
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/4987209d33a70cada8d327058cd07e73740a254b

   - frantzen@@cvs.openbsd.org 2004/04/24 18:11:46
     [openbsd-compat/tree.h]
     sync to Niels Provos' version.  avoid unused variable warning in
     RB_NEXT()
---

diff --git a/ChangeLog b/ChangeLog
index 70f92979..ded18bba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,10 @@
      [openbsd-compat/base64.c]
      remove calls to abort(3) that can't happen anyway; from
      <bret dot lambert at gmail.com>; ok millert@ deraadt@
+   - frantzen@@cvs.openbsd.org 2004/04/24 18:11:46
+     [openbsd-compat/tree.h]
+     sync to Niels Provos' version.  avoid unused variable warning in
+     RB_NEXT()
  - (djm) [regress/sftp-cmds.sh]
    Use more restrictive glob to pick up test files from /bin - some platforms
    ship broken symlinks there which could spoil the test.
diff --git a/openbsd-compat/sys-tree.h b/openbsd-compat/sys-tree.h
index c80b90b2..77124803 100644
--- a/openbsd-compat/sys-tree.h
+++ b/openbsd-compat/sys-tree.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
+/*	$OpenBSD: tree.h,v 1.8 2004/04/24 18:11:46 frantzen Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -381,7 +381,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);			\
 									\
 
@@ -626,7 +626,7 @@ name##_RB_FIND(struct name *head, struct type *elm)			\
 }									\
 									\
 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);				\
@@ -667,13 +667,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_ */