tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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()
This commit is contained in:
Damien Miller 2007-10-26 16:37:43 +10:00
parent 2f715eeb5c
commit 88aa4e3d61
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.
@ -3363,4 +3367,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4783 2007/10/26 06:26:46 djm Exp $
$Id: ChangeLog,v 1.4784 2007/10/26 06:37:43 djm Exp $

10
openbsd-compat/sys-tree.h
View File

@ -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_ */