SLIST_REMOVE_NEXT -> SLIST_REMOVE_AFTER for better consistency and

compatibility with FreeBSD/NetBSD.
Also rename SIMPLEQ_REMOVE_NEXT to SIMPLEQ_REMOVE_AFTER.

ok mikeb@ guenther@

2 files changed, 24 insertions, 24 deletions

diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index fe2c51d0e14..808c83ed465 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 2012/01/11 00:06:48 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.25 2012/04/11 13:29:14 naddy Exp $
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
 
 MAN=	assert.3 bitstring.3 CMSG_DATA.3 dlfcn.3 dl_iterate_phdr.3 end.3 \
@@ -17,7 +17,7 @@ MLINKS+=queue.3 SLIST_ENTRY.3 queue.3 SLIST_HEAD.3 \
 	queue.3 SLIST_FOREACH.3 queue.3 SLIST_FOREACH_SAFE.3 \
 	queue.3 SLIST_INIT.3 \
 	queue.3 SLIST_INSERT_AFTER.3 queue.3 SLIST_INSERT_HEAD.3 \
-	queue.3 SLIST_REMOVE_HEAD.3 queue.3 SLIST_REMOVE_NEXT.3 \
+	queue.3 SLIST_REMOVE_AFTER.3 queue.3 SLIST_REMOVE_HEAD.3 \
 	queue.3 SLIST_REMOVE.3
 MLINKS+=queue.3 LIST_ENTRY.3 queue.3 LIST_HEAD.3 \
 	queue.3 LIST_HEAD_INITIALIZER.3 queue.3 LIST_FIRST.3 \
@@ -34,7 +34,7 @@ MLINKS+=queue.3 SIMPLEQ_ENTRY.3 queue.3 SIMPLEQ_HEAD.3 \
 	queue.3 SIMPLEQ_FOREACH_SAFE.3 queue.3 SIMPLEQ_INIT.3 \
 	queue.3 SIMPLEQ_INSERT_HEAD.3 queue.3 SIMPLEQ_INSERT_TAIL.3 \
 	queue.3 SIMPLEQ_INSERT_AFTER.3 queue.3 SIMPLEQ_REMOVE_HEAD.3 \
-	queue.3 SIMPLEQ_REMOVE_NEXT.3
+	queue.3 SIMPLEQ_REMOVE_AFTER.3
 MLINKS+=queue.3 TAILQ_ENTRY.3 queue.3 TAILQ_HEAD.3 \
 	queue.3 TAILQ_HEAD_INITIALIZER.3 queue.3 TAILQ_FIRST.3 \
 	queue.3 TAILQ_NEXT.3 queue.3 TAILQ_END.3 queue.3 TAILQ_LAST.3 \
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index dc19e99ba46..04d99538ba6 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: queue.3,v 1.55 2012/03/06 23:41:59 haesbaert Exp $
+.\"	$OpenBSD: queue.3,v 1.56 2012/04/11 13:29:14 naddy Exp $
 .\"	$NetBSD: queue.3,v 1.4 1995/07/03 00:25:36 mycroft Exp $
 .\"
 .\" Copyright (c) 1993 The Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)queue.3	8.1 (Berkeley) 12/13/93
 .\"
-.Dd $Mdocdate: March 6 2012 $
+.Dd $Mdocdate: April 11 2012 $
 .Dt QUEUE 3
 .Os
 .Sh NAME
@@ -46,8 +46,8 @@
 .Nm SLIST_INIT ,
 .Nm SLIST_INSERT_AFTER ,
 .Nm SLIST_INSERT_HEAD ,
+.Nm SLIST_REMOVE_AFTER ,
 .Nm SLIST_REMOVE_HEAD ,
-.Nm SLIST_REMOVE_NEXT ,
 .Nm SLIST_REMOVE ,
 .Nm LIST_ENTRY ,
 .Nm LIST_HEAD ,
@@ -74,11 +74,11 @@
 .Nm SIMPLEQ_FOREACH ,
 .Nm SIMPLEQ_FOREACH_SAFE ,
 .Nm SIMPLEQ_INIT ,
+.Nm SIMPLEQ_INSERT_AFTER ,
 .Nm SIMPLEQ_INSERT_HEAD ,
 .Nm SIMPLEQ_INSERT_TAIL ,
-.Nm SIMPLEQ_INSERT_AFTER ,
+.Nm SIMPLEQ_REMOVE_AFTER ,
 .Nm SIMPLEQ_REMOVE_HEAD ,
-.Nm SIMPLEQ_REMOVE_NEXT ,
 .Nm TAILQ_ENTRY ,
 .Nm TAILQ_HEAD ,
 .Nm TAILQ_HEAD_INITIALIZER ,
@@ -142,9 +142,9 @@
 .Ft void
 .Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "struct TYPE *elm" "SLIST_ENTRY NAME"
 .Ft void
-.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME"
+.Fn SLIST_REMOVE_AFTER "struct TYPE *elm" "SLIST_ENTRY NAME"
 .Ft void
-.Fn SLIST_REMOVE_NEXT "SLIST_HEAD *head" "struct TYPE *elm" "SLIST_ENTRY NAME"
+.Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME"
 .Ft void
 .Fn SLIST_REMOVE "SLIST_HEAD *head" "struct TYPE *elm" "TYPE" "SLIST_ENTRY NAME"
 .Pp
@@ -190,15 +190,15 @@
 .Ft void
 .Fn SIMPLEQ_INIT "SIMPLEQ_HEAD *head"
 .Ft void
+.Fn SIMPLEQ_INSERT_AFTER "SIMPLEQ_HEAD *head" "struct TYPE *listelm" "struct TYPE *elm" "SIMPLEQ_ENTRY NAME"
+.Ft void
 .Fn SIMPLEQ_INSERT_HEAD "SIMPLEQ_HEAD *head" "struct TYPE *elm" "SIMPLEQ_ENTRY NAME"
 .Ft void
 .Fn SIMPLEQ_INSERT_TAIL "SIMPLEQ_HEAD *head" "struct TYPE *elm" "SIMPLEQ_ENTRY NAME"
 .Ft void
-.Fn SIMPLEQ_INSERT_AFTER "SIMPLEQ_HEAD *head" "struct TYPE *listelm" "struct TYPE *elm" "SIMPLEQ_ENTRY NAME"
+.Fn SIMPLEQ_REMOVE_AFTER "SIMPLEQ_HEAD *head" "struct TYPE *elm" "SIMPLEQ_ENTRY NAME"
 .Ft void
 .Fn SIMPLEQ_REMOVE_HEAD "SIMPLEQ_HEAD *head" "SIMPLEQ_ENTRY NAME"
-.Ft void
-.Fn SIMPLEQ_REMOVE_NEXT "SIMPLEQ_HEAD *head" "struct TYPE *elm" "SIMPLEQ_ENTRY NAME"
 .Pp
 .Fn TAILQ_ENTRY "TYPE"
 .Fn TAILQ_HEAD "HEADNAME" "TYPE"
@@ -472,7 +472,7 @@ macro removes the first element of the list pointed by
 .Fa head .
 .Pp
 The
-.Fn SLIST_REMOVE_NEXT
+.Fn SLIST_REMOVE_AFTER
 macro removes the list element immediately following
 .Fa elm .
 .Pp
@@ -733,6 +733,13 @@ SIMPLEQ_HEAD(HEADNAME, TYPE) head = SIMPLEQ_HEAD_INITIALIZER(head);
 .Ed
 .Pp
 The
+.Fn SIMPLEQ_INSERT_AFTER
+macro inserts the new element
+.Fa elm
+after the element
+.Fa listelm .
+.Pp
+The
 .Fn SIMPLEQ_INSERT_HEAD
 macro inserts the new element
 .Fa elm
@@ -745,11 +752,9 @@ macro inserts the new element
 at the end of the queue.
 .Pp
 The
-.Fn SIMPLEQ_INSERT_AFTER
-macro inserts the new element
-.Fa elm
-after the element
-.Fa listelm .
+.Fn SIMPLEQ_REMOVE_AFTER
+macro removes the queue element immediately following
+.Fa elm .
 .Pp
 The
 .Fn SIMPLEQ_REMOVE_HEAD
@@ -757,11 +762,6 @@ macro removes the first element
 from the queue.
 .Pp
 The
-.Fn SIMPLEQ_REMOVE_NEXT
-macro removes the queue element immediately following
-.Fa elm .
-.Pp
-The
 .Fn SIMPLEQ_FIRST
 and
 .Fn SIMPLEQ_NEXT