Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

1 files changed, 60 insertions, 60 deletions

diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h
index 16224681331..c81cf953901 100644
--- a/lib/libpthread/include/pthread.h
+++ b/lib/libpthread/include/pthread.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread.h,v 1.14 2002/01/10 00:45:30 fgsch Exp $	*/
+/*	$OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
@@ -143,7 +143,7 @@ typedef struct	pthread_rwlockattr	*pthread_rwlockattr_t;
  * use in header symbols.
  */
 typedef void	*pthread_addr_t;
-typedef void	*(*pthread_startroutine_t) __P((void *));
+typedef void	*(*pthread_startroutine_t)(void *);
 
 /*
  * Once definitions.
@@ -204,20 +204,20 @@ enum pthread_mutextype {
  * Thread function prototype definitions:
  */
 __BEGIN_DECLS
-int		pthread_attr_destroy __P((pthread_attr_t *));
-int		pthread_attr_getstacksize __P((pthread_attr_t *, size_t *));
-int		pthread_attr_getstackaddr __P((pthread_attr_t *, void **));
+int		pthread_attr_destroy(pthread_attr_t *);
+int		pthread_attr_getstacksize(pthread_attr_t *, size_t *);
+int		pthread_attr_getstackaddr(pthread_attr_t *, void **);
 int		pthread_attr_getdetachstate __P((const pthread_attr_t *,
 			int *));
-int		pthread_attr_init __P((pthread_attr_t *));
-int		pthread_attr_setstacksize __P((pthread_attr_t *, size_t));
-int		pthread_attr_setstackaddr __P((pthread_attr_t *, void *));
-int		pthread_attr_setdetachstate __P((pthread_attr_t *, int));
-void		pthread_cleanup_pop __P((int execute));
+int		pthread_attr_init(pthread_attr_t *);
+int		pthread_attr_setstacksize(pthread_attr_t *, size_t);
+int		pthread_attr_setstackaddr(pthread_attr_t *, void *);
+int		pthread_attr_setdetachstate(pthread_attr_t *, int);
+void		pthread_cleanup_pop(int execute);
 void		pthread_cleanup_push __P((void (*routine) (void *),
 			void *routine_arg));
-int		pthread_condattr_destroy __P((pthread_condattr_t *attr));
-int		pthread_condattr_init __P((pthread_condattr_t *attr));
+int		pthread_condattr_destroy(pthread_condattr_t *attr);
+int		pthread_condattr_init(pthread_condattr_t *attr);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
 int		pthread_condattr_getpshared __P((const pthread_condattr_t *attr,
@@ -226,63 +226,63 @@ int		pthread_condattr_setpshared __P((pthread_condattr_t *attr,
 			int pshared));
 #endif
 
-int		pthread_cond_broadcast __P((pthread_cond_t *));
-int		pthread_cond_destroy __P((pthread_cond_t *));
+int		pthread_cond_broadcast(pthread_cond_t *);
+int		pthread_cond_destroy(pthread_cond_t *);
 int		pthread_cond_init __P((pthread_cond_t *,
 			const pthread_condattr_t *));
-int		pthread_cond_signal __P((pthread_cond_t *));
+int		pthread_cond_signal(pthread_cond_t *);
 int		pthread_cond_timedwait __P((pthread_cond_t *,
 			pthread_mutex_t *, const struct timespec * abstime));
-int		pthread_cond_wait __P((pthread_cond_t *, pthread_mutex_t *));
+int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
 int		pthread_create __P((pthread_t *, const pthread_attr_t *,
 			void *(*start_routine) (void *), void *));
-int		pthread_detach __P((pthread_t));
-int		pthread_equal __P((pthread_t, pthread_t));
-__dead void	pthread_exit __P((void *)) __attribute__((__noreturn__));
-void		*pthread_getspecific __P((pthread_key_t));
-int		pthread_join __P((pthread_t, void **));
+int		pthread_detach(pthread_t);
+int		pthread_equal(pthread_t, pthread_t);
+__dead void	pthread_exit(void *) __attribute__((__noreturn__));
+void		*pthread_getspecific(pthread_key_t);
+int		pthread_join(pthread_t, void **);
 int		pthread_key_create __P((pthread_key_t *,
 			void (*routine) (void *)));
-int		pthread_key_delete __P((pthread_key_t));
-int		pthread_kill __P((struct pthread *, int));
-int		pthread_mutexattr_init __P((pthread_mutexattr_t *));
-int		pthread_mutexattr_destroy __P((pthread_mutexattr_t *));
-int		pthread_mutexattr_gettype __P((pthread_mutexattr_t *, int *));
-int		pthread_mutexattr_settype __P((pthread_mutexattr_t *, int));
-int		pthread_mutex_destroy __P((pthread_mutex_t *));
+int		pthread_key_delete(pthread_key_t);
+int		pthread_kill(struct pthread *, int);
+int		pthread_mutexattr_init(pthread_mutexattr_t *);
+int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
+int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
+int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
+int		pthread_mutex_destroy(pthread_mutex_t *);
 int		pthread_mutex_init __P((pthread_mutex_t *,
 			const pthread_mutexattr_t *));
-int		pthread_mutex_lock __P((pthread_mutex_t *));
-int		pthread_mutex_trylock __P((pthread_mutex_t *));
-int		pthread_mutex_unlock __P((pthread_mutex_t *));
+int		pthread_mutex_lock(pthread_mutex_t *);
+int		pthread_mutex_trylock(pthread_mutex_t *);
+int		pthread_mutex_unlock(pthread_mutex_t *);
 int		pthread_once __P((pthread_once_t *,
 			void (*) (void)));
-int		pthread_rwlock_destroy __P((pthread_rwlock_t *));
+int		pthread_rwlock_destroy(pthread_rwlock_t *);
 int		pthread_rwlock_init __P((pthread_rwlock_t *,
 			const pthread_rwlockattr_t *));
-int		pthread_rwlock_rdlock __P((pthread_rwlock_t *));
-int		pthread_rwlock_tryrdlock __P((pthread_rwlock_t *));
-int		pthread_rwlock_trywrlock __P((pthread_rwlock_t *));
-int		pthread_rwlock_unlock __P((pthread_rwlock_t *));
-int		pthread_rwlock_wrlock __P((pthread_rwlock_t *));
-int		pthread_rwlockattr_init __P((pthread_rwlockattr_t *));
+int		pthread_rwlock_rdlock(pthread_rwlock_t *);
+int		pthread_rwlock_tryrdlock(pthread_rwlock_t *);
+int		pthread_rwlock_trywrlock(pthread_rwlock_t *);
+int		pthread_rwlock_unlock(pthread_rwlock_t *);
+int		pthread_rwlock_wrlock(pthread_rwlock_t *);
+int		pthread_rwlockattr_init(pthread_rwlockattr_t *);
 int		pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *,
 			int *));
 int		pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *,
 			int));
-int		pthread_rwlockattr_destroy __P((pthread_rwlockattr_t *));
-pthread_t	pthread_self __P((void));
-int		pthread_setspecific __P((pthread_key_t, const void *));
-int		pthread_sigmask __P((int, const sigset_t *, sigset_t *));
+int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
+pthread_t	pthread_self(void);
+int		pthread_setspecific(pthread_key_t, const void *);
+int		pthread_sigmask(int, const sigset_t *, sigset_t *);
 
-int		pthread_cancel __P((pthread_t));
-int		pthread_setcancelstate __P((int, int *));
-int		pthread_setcanceltype __P((int, int *));
-void		pthread_testcancel __P((void));
+int		pthread_cancel(pthread_t);
+int		pthread_setcancelstate(int, int *);
+int		pthread_setcanceltype(int, int *);
+void		pthread_testcancel(void);
 
-int		pthread_getprio __P((pthread_t));
-int		pthread_setprio __P((pthread_t, int));
-void		pthread_yield __P((void));
+int		pthread_getprio(pthread_t);
+int		pthread_setprio(pthread_t, int);
+void		pthread_yield(void);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
 int		pthread_mutexattr_getpshared __P((pthread_mutexattr_t *,
@@ -296,7 +296,7 @@ int		pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *,
 			int *prioceiling));
 int		pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *,
 			int prioceiling));
-int		pthread_mutex_getprioceiling __P((pthread_mutex_t *, int *));
+int		pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
 int		pthread_mutex_setprioceiling __P((pthread_mutex_t *, int,
 			int *));
 #endif
@@ -314,20 +314,20 @@ int		pthread_setschedparam __P((pthread_t pthread, int policy,
 			const struct sched_param * param));
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-int		pthread_attr_getinheritsched __P((const pthread_attr_t *, int *));
+int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
 int		pthread_attr_getschedparam __P((const pthread_attr_t *,
 			struct sched_param *));
-int		pthread_attr_getschedpolicy __P((const pthread_attr_t *, int *));
-int		pthread_attr_getscope __P((const pthread_attr_t *, int *));
-int		pthread_attr_setinheritsched __P((pthread_attr_t *, int));
+int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
+int		pthread_attr_getscope(const pthread_attr_t *, int *);
+int		pthread_attr_setinheritsched(pthread_attr_t *, int);
 int		pthread_attr_setschedparam __P((pthread_attr_t *,
 			const struct sched_param *));
-int		pthread_attr_setschedpolicy __P((pthread_attr_t *, int));
-int		pthread_attr_setscope __P((pthread_attr_t *, int));
+int		pthread_attr_setschedpolicy(pthread_attr_t *, int);
+int		pthread_attr_setscope(pthread_attr_t *, int);
 #endif
 
-int		pthread_attr_setfloatstate __P((pthread_attr_t *, int));
-int		pthread_attr_getfloatstate __P((pthread_attr_t *, int *));
+int		pthread_attr_setfloatstate(pthread_attr_t *, int);
+int		pthread_attr_getfloatstate(pthread_attr_t *, int *);
 int		pthread_attr_setcleanup __P((pthread_attr_t *,
 			void (*routine) (void *), void *));
 
@@ -343,8 +343,8 @@ int		pthread_attr_getguardsize __P((const pthread_attr_t *,
 			size_t *));
 int		pthread_attr_setguardsize __P((const pthread_attr_t *, 
 			size_t));
-int		pthread_getconcurrency __P((void));
-int		pthread_setconcurrency __P((int));
+int		pthread_getconcurrency(void);
+int		pthread_setconcurrency(int);
 #endif	/* susv2 */
 
 __END_DECLS