o point pthread_setcancel(type|state) manpages where they belong.

o remove functions from pthread_cancel(3).

4 files changed, 14 insertions, 32 deletions

diff --git a/lib/libc_r/man/Makefile.inc b/lib/libc_r/man/Makefile.inc
index baac6d38ebc..a2bebc43b48 100644
--- a/lib/libc_r/man/Makefile.inc
+++ b/lib/libc_r/man/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.11 2001/08/19 03:35:31 pvalchev Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2001/12/07 15:47:44 fgsch Exp $
 # $FreeBSD: Makefile.inc,v 1.6 1999/08/28 00:03:02 peter Exp $
 
 # POSIX thread man files
@@ -63,8 +63,6 @@ MLINKS+=flockfile.3 funlockfile.3 \
 	flockfile.3 ftrylockfile.3 \
 	pthread_rwlock_rdlock.3 pthread_rwlock_tryrdlock.3 \
 	pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3 \
-	pthread_cancel.3 pthread_setcancelstate.3 \
-	pthread_cancel.3 pthread_setcanceltype.3 \
 	getc_unlocked.3 getchar_unlocked.3 \
 	putc_unlocked.3 putchar_unlocked.3 \
 	pthread_suspend_np.3 pthread_resume_np.3 \
@@ -84,5 +82,7 @@ MLINKS+=flockfile.3 funlockfile.3 \
 	pthread_mutexattr.3 pthread_mutexattr_setpshared.3 \
 	pthread_mutexattr.3 pthread_mutexattr_settype.3 \
 	pthread_schedparam.3 pthread_getschedparam.3 \
-	pthread_schedparam.3 pthread_setschedparam.3
+	pthread_schedparam.3 pthread_setschedparam.3 \
+	pthread_testcancel.3 pthread_setcancelstate.3 \
+	pthread_testcancel.3 pthread_setcanceltype.3
 
diff --git a/lib/libc_r/man/pthread_cancel.3 b/lib/libc_r/man/pthread_cancel.3
index e7f1a3db4f3..2d863956b28 100644
--- a/lib/libc_r/man/pthread_cancel.3
+++ b/lib/libc_r/man/pthread_cancel.3
@@ -1,20 +1,14 @@
-.\" $OpenBSD: pthread_cancel.3,v 1.7 2001/06/24 18:17:30 jasoni Exp $
+.\" $OpenBSD: pthread_cancel.3,v 1.8 2001/12/07 15:47:44 fgsch Exp $
 .Dd January 17, 1999
 .Dt PTHREAD_CANCEL 3
 .Os
 .Sh NAME
-.Nm pthread_cancel ,
-.Nm pthread_setcancelstate ,
-.Nm pthread_setcanceltype
+.Nm pthread_cancel
 .Nd cancel execution of a thread
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
 .Fn pthread_cancel "pthread_t thread"
-.Ft int
-.Fn pthread_setcancelstate "int state" "int *oldstate"
-.Ft int
-.Fn pthread_setcanceltype "int type" "int *oldtype"
 .Sh DESCRIPTION
 The
 .Fn pthread_cancel
@@ -66,10 +60,7 @@ thread ID.
 .Xr pthread_setcanceltype 3 ,
 .Xr pthread_testcancel 3
 .Sh STANDARDS
-.Fn pthread_cancel ,
-.Fn pthread_setcancelstate ,
-and
-.Fn pthread_setcanceltype
+.Fn pthread_cancel
 conform to ISO/IEC 9945-1 ANSI/IEEE
 .Pq Dq Tn POSIX
 Std 1003.1 Second Edition 1996-07-12.
diff --git a/lib/libpthread/man/Makefile.inc b/lib/libpthread/man/Makefile.inc
index baac6d38ebc..a2bebc43b48 100644
--- a/lib/libpthread/man/Makefile.inc
+++ b/lib/libpthread/man/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.11 2001/08/19 03:35:31 pvalchev Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2001/12/07 15:47:44 fgsch Exp $
 # $FreeBSD: Makefile.inc,v 1.6 1999/08/28 00:03:02 peter Exp $
 
 # POSIX thread man files
@@ -63,8 +63,6 @@ MLINKS+=flockfile.3 funlockfile.3 \
 	flockfile.3 ftrylockfile.3 \
 	pthread_rwlock_rdlock.3 pthread_rwlock_tryrdlock.3 \
 	pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3 \
-	pthread_cancel.3 pthread_setcancelstate.3 \
-	pthread_cancel.3 pthread_setcanceltype.3 \
 	getc_unlocked.3 getchar_unlocked.3 \
 	putc_unlocked.3 putchar_unlocked.3 \
 	pthread_suspend_np.3 pthread_resume_np.3 \
@@ -84,5 +82,7 @@ MLINKS+=flockfile.3 funlockfile.3 \
 	pthread_mutexattr.3 pthread_mutexattr_setpshared.3 \
 	pthread_mutexattr.3 pthread_mutexattr_settype.3 \
 	pthread_schedparam.3 pthread_getschedparam.3 \
-	pthread_schedparam.3 pthread_setschedparam.3
+	pthread_schedparam.3 pthread_setschedparam.3 \
+	pthread_testcancel.3 pthread_setcancelstate.3 \
+	pthread_testcancel.3 pthread_setcanceltype.3
 
diff --git a/lib/libpthread/man/pthread_cancel.3 b/lib/libpthread/man/pthread_cancel.3
index e7f1a3db4f3..2d863956b28 100644
--- a/lib/libpthread/man/pthread_cancel.3
+++ b/lib/libpthread/man/pthread_cancel.3
@@ -1,20 +1,14 @@
-.\" $OpenBSD: pthread_cancel.3,v 1.7 2001/06/24 18:17:30 jasoni Exp $
+.\" $OpenBSD: pthread_cancel.3,v 1.8 2001/12/07 15:47:44 fgsch Exp $
 .Dd January 17, 1999
 .Dt PTHREAD_CANCEL 3
 .Os
 .Sh NAME
-.Nm pthread_cancel ,
-.Nm pthread_setcancelstate ,
-.Nm pthread_setcanceltype
+.Nm pthread_cancel
 .Nd cancel execution of a thread
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
 .Fn pthread_cancel "pthread_t thread"
-.Ft int
-.Fn pthread_setcancelstate "int state" "int *oldstate"
-.Ft int
-.Fn pthread_setcanceltype "int type" "int *oldtype"
 .Sh DESCRIPTION
 The
 .Fn pthread_cancel
@@ -66,10 +60,7 @@ thread ID.
 .Xr pthread_setcanceltype 3 ,
 .Xr pthread_testcancel 3
 .Sh STANDARDS
-.Fn pthread_cancel ,
-.Fn pthread_setcancelstate ,
-and
-.Fn pthread_setcanceltype
+.Fn pthread_cancel
 conform to ISO/IEC 9945-1 ANSI/IEEE
 .Pq Dq Tn POSIX
 Std 1003.1 Second Edition 1996-07-12.