Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix date and conflict; use Dv for NULL.

This commit is contained in:
wiz 2013-03-29 21:45:27 +00:00
parent 862b7a4cdd
commit 3f06676b22
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
share/man/man3/tree.3
View File

@ -1,4 +1,4 @@
.\" $NetBSD: tree.3,v 1.9 2013/03/29 21:16:31 christos Exp $ .\" $NetBSD: tree.3,v 1.10 2013/03/29 21:45:27 wiz Exp $
.\" $OpenBSD: tree.3,v 1.23 2011/07/09 08:43:01 jmc Exp $ .\" $OpenBSD: tree.3,v 1.23 2011/07/09 08:43:01 jmc Exp $
.\"/* .\"/*
.\" * Copyright 2002 Niels Provos <provos@citi.umich.edu> .\" * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@ -24,7 +24,7 @@
.\" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" */ .\" */
.Dd July 9 2011 .Dd July 9, 2011
.Dt TREE 3 .Dt TREE 3
.Os .Os
.Sh NAME .Sh NAME
@ -241,11 +241,7 @@ macro, but should be used only once.
Finally, Finally,
the the
.Fa CMP .Fa CMP
<<<<<<< tree.3
argument is the name of a function used to compare trees' nodes argument is the name of a function used to compare trees' nodes
=======
argument is the name of a function used to compare tree nodes
>>>>>>> 1.8
with each other. with each other.
The function takes two arguments of type The function takes two arguments of type
.Fa "struct TYPE *" . .Fa "struct TYPE *" .
@ -273,7 +269,7 @@ macro inserts the new element
.Fa elm .Fa elm
into the tree. into the tree.
Upon success, Upon success,
.Va NULL .Dv NULL
is returned. is returned.
If a matching element already exists in the tree, the insertion is If a matching element already exists in the tree, the insertion is
aborted, and a pointer to the existing element is returned. aborted, and a pointer to the existing element is returned.
@ -285,7 +281,7 @@ macro removes the element
from the tree pointed by from the tree pointed by
.Fa head . .Fa head .
Upon success, a pointer to the removed element is returned. Upon success, a pointer to the removed element is returned.
.Va NULL .Dv NULL
is returned if is returned if
.Fa elm .Fa elm
is not present in the tree. is not present in the tree.
@ -418,7 +414,7 @@ macro inserts the new element
.Fa elm .Fa elm
into the tree. into the tree.
Upon success, Upon success,
.Va NULL .Dv NULL
is returned. is returned.
If a matching element already exists in the tree, the insertion is If a matching element already exists in the tree, the insertion is
aborted, and a pointer to the existing element is returned. aborted, and a pointer to the existing element is returned.
@ -455,7 +451,7 @@ The
.Fn RB_ROOT , .Fn RB_ROOT ,
.Fn RB_MIN , .Fn RB_MIN ,
.Fn RB_MAX , .Fn RB_MAX ,
.Fn RB_NEXT, .Fn RB_NEXT ,
and and
.Fn RB_PREV .Fn RB_PREV
macros can be used to traverse the tree: macros can be used to traverse the tree: