From 8ebd4b8855981462a03f5930a1f8d712c021190f Mon Sep 17 00:00:00 2001
From: Austin Foxley <austinf@cetoncorp.com>
Date: Wed, 9 Dec 2009 16:53:57 -0800
Subject: nptl: fix old style function declerations
also fix a few shadowed local warnings
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
---
libpthread/nptl/cleanup_compat.c | 14 +++++++-------
libpthread/nptl/cleanup_defer_compat.c | 14 +++++++-------
libpthread/nptl/pthreadP.h | 7 +++----
libpthread/nptl/pthread_atfork.c | 8 ++++----
libpthread/nptl/pthread_attr_destroy.c | 3 +--
libpthread/nptl/pthread_attr_getdetachstate.c | 4 +---
libpthread/nptl/pthread_attr_getguardsize.c | 4 +---
libpthread/nptl/pthread_attr_getinheritsched.c | 6 +++---
libpthread/nptl/pthread_attr_getschedparam.c | 6 +++---
libpthread/nptl/pthread_attr_getschedpolicy.c | 6 +++---
libpthread/nptl/pthread_attr_getscope.c | 6 +++---
libpthread/nptl/pthread_attr_getstack.c | 8 ++++----
libpthread/nptl/pthread_attr_getstackaddr.c | 6 +++---
libpthread/nptl/pthread_attr_getstacksize.c | 6 +++---
libpthread/nptl/pthread_attr_init.c | 3 +--
libpthread/nptl/pthread_attr_setdetachstate.c | 4 +---
libpthread/nptl/pthread_attr_setguardsize.c | 4 +---
libpthread/nptl/pthread_attr_setinheritsched.c | 6 +++---
libpthread/nptl/pthread_attr_setschedparam.c | 6 +++---
libpthread/nptl/pthread_attr_setschedpolicy.c | 6 +++---
libpthread/nptl/pthread_attr_setscope.c | 6 +++---
libpthread/nptl/pthread_attr_setstack.c | 8 ++++----
libpthread/nptl/pthread_attr_setstackaddr.c | 6 +++---
libpthread/nptl/pthread_attr_setstacksize.c | 6 +++---
libpthread/nptl/pthread_barrier_destroy.c | 3 +--
libpthread/nptl/pthread_barrier_init.c | 8 ++++----
libpthread/nptl/pthread_barrierattr_destroy.c | 3 +--
libpthread/nptl/pthread_barrierattr_getpshared.c | 6 +++---
libpthread/nptl/pthread_barrierattr_init.c | 3 +--
libpthread/nptl/pthread_barrierattr_setpshared.c | 6 +++---
libpthread/nptl/pthread_cancel.c | 3 +--
libpthread/nptl/pthread_cond_destroy.c | 3 +--
libpthread/nptl/pthread_cond_init.c | 6 +++---
libpthread/nptl/pthread_condattr_destroy.c | 3 +--
libpthread/nptl/pthread_condattr_getclock.c | 6 +++---
libpthread/nptl/pthread_condattr_getpshared.c | 6 +++---
libpthread/nptl/pthread_condattr_init.c | 3 +--
libpthread/nptl/pthread_condattr_setclock.c | 6 +++---
libpthread/nptl/pthread_condattr_setpshared.c | 6 +++---
libpthread/nptl/pthread_detach.c | 3 +--
libpthread/nptl/pthread_equal.c | 4 +---
libpthread/nptl/pthread_exit.c | 3 +--
libpthread/nptl/pthread_getattr_np.c | 6 +++---
libpthread/nptl/pthread_getschedparam.c | 8 ++++----
libpthread/nptl/pthread_getspecific.c | 3 +--
libpthread/nptl/pthread_join.c | 4 +---
libpthread/nptl/pthread_key_create.c | 6 +++---
libpthread/nptl/pthread_key_delete.c | 3 +--
libpthread/nptl/pthread_mutex_destroy.c | 3 +--
libpthread/nptl/pthread_mutex_init.c | 6 +++---
libpthread/nptl/pthread_mutex_lock.c | 3 +--
libpthread/nptl/pthread_mutex_timedlock.c | 6 +++---
libpthread/nptl/pthread_mutex_trylock.c | 3 +--
libpthread/nptl/pthread_mutex_unlock.c | 9 ++++-----
libpthread/nptl/pthread_mutexattr_destroy.c | 3 +--
libpthread/nptl/pthread_mutexattr_getpshared.c | 6 +++---
libpthread/nptl/pthread_mutexattr_gettype.c | 6 +++---
libpthread/nptl/pthread_mutexattr_init.c | 3 +--
libpthread/nptl/pthread_mutexattr_setpshared.c | 6 +++---
libpthread/nptl/pthread_mutexattr_settype.c | 6 +++---
libpthread/nptl/pthread_rwlock_destroy.c | 3 +--
libpthread/nptl/pthread_rwlock_init.c | 6 +++---
libpthread/nptl/pthread_rwlock_tryrdlock.c | 3 +--
libpthread/nptl/pthread_rwlock_trywrlock.c | 3 +--
libpthread/nptl/pthread_rwlockattr_destroy.c | 3 +--
libpthread/nptl/pthread_rwlockattr_getkind_np.c | 6 +++---
libpthread/nptl/pthread_rwlockattr_getpshared.c | 6 +++---
libpthread/nptl/pthread_rwlockattr_init.c | 3 +--
libpthread/nptl/pthread_rwlockattr_setkind_np.c | 6 +++---
libpthread/nptl/pthread_rwlockattr_setpshared.c | 6 +++---
libpthread/nptl/pthread_setcancelstate.c | 6 +++---
libpthread/nptl/pthread_setcanceltype.c | 6 +++---
libpthread/nptl/pthread_setconcurrency.c | 3 +--
libpthread/nptl/pthread_setschedparam.c | 8 ++++----
libpthread/nptl/pthread_setschedprio.c | 4 +---
libpthread/nptl/pthread_setspecific.c | 6 +++---
libpthread/nptl/pthread_timedjoin.c | 8 ++++----
libpthread/nptl/pthread_tryjoin.c | 4 +---
libpthread/nptl/sem_close.c | 3 +--
libpthread/nptl/sem_destroy.c | 3 +--
libpthread/nptl/sem_getvalue.c | 6 +++---
libpthread/nptl/sem_init.c | 8 ++++----
libpthread/nptl/sem_unlink.c | 3 +--
libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h | 1 +
libpthread/nptl/sysdeps/i386/pthread_spin_lock.c | 3 +--
libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c | 8 ++++----
libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c | 6 +++---
libpthread/nptl/sysdeps/pthread/pthread_sigmask.c | 8 ++++----
libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c | 3 +--
libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h | 2 +-
.../nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 6 +++---
libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c | 6 +++---
libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c | 8 ++++----
libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c | 3 +--
libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c | 3 +--
libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c | 6 +++---
libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c | 10 +++++-----
.../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 6 +++---
98 files changed, 234 insertions(+), 282 deletions(-)
diff --git a/libpthread/nptl/cleanup_compat.c b/libpthread/nptl/cleanup_compat.c
index a25b397f9..77d714f7f 100644
--- a/libpthread/nptl/cleanup_compat.c
+++ b/libpthread/nptl/cleanup_compat.c
@@ -22,10 +22,10 @@
void
-_pthread_cleanup_push (buffer, routine, arg)
- struct _pthread_cleanup_buffer *buffer;
- void (*routine) (void *);
- void *arg;
+_pthread_cleanup_push (
+ struct _pthread_cleanup_buffer *buffer,
+ void (*routine) (void *),
+ void *arg)
{
struct pthread *self = THREAD_SELF;
@@ -39,9 +39,9 @@ strong_alias (_pthread_cleanup_push, __pthread_cleanup_push)
void
-_pthread_cleanup_pop (buffer, execute)
- struct _pthread_cleanup_buffer *buffer;
- int execute;
+_pthread_cleanup_pop (
+ struct _pthread_cleanup_buffer *buffer,
+ int execute)
{
struct pthread *self __attribute ((unused)) = THREAD_SELF;
diff --git a/libpthread/nptl/cleanup_defer_compat.c b/libpthread/nptl/cleanup_defer_compat.c
index a0ed6da88..8fd9b5415 100644
--- a/libpthread/nptl/cleanup_defer_compat.c
+++ b/libpthread/nptl/cleanup_defer_compat.c
@@ -21,10 +21,10 @@
void
-_pthread_cleanup_push_defer (buffer, routine, arg)
- struct _pthread_cleanup_buffer *buffer;
- void (*routine) (void *);
- void *arg;
+_pthread_cleanup_push_defer (
+ struct _pthread_cleanup_buffer *buffer,
+ void (*routine) (void *),
+ void *arg)
{
struct pthread *self = THREAD_SELF;
@@ -60,9 +60,9 @@ strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer)
void
-_pthread_cleanup_pop_restore (buffer, execute)
- struct _pthread_cleanup_buffer *buffer;
- int execute;
+_pthread_cleanup_pop_restore (
+ struct _pthread_cleanup_buffer *buffer,
+ int execute)
{
struct pthread *self = THREAD_SELF;
diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h
index 45222f45e..61d59f601 100644
--- a/libpthread/nptl/pthreadP.h
+++ b/libpthread/nptl/pthreadP.h
@@ -108,8 +108,8 @@ extern int __pthread_debug attribute_hidden;
/* Cancellation test. */
#define CANCELLATION_P(self) \
do { \
- int cancelhandling = THREAD_GETMEM (self, cancelhandling); \
- if (CANCEL_ENABLED_AND_CANCELED (cancelhandling)) \
+ int _cancelhandling = THREAD_GETMEM (self, cancelhandling); \
+ if (CANCEL_ENABLED_AND_CANCELED (_cancelhandling)) \
{ \
THREAD_SETMEM (self, result, PTHREAD_CANCELED); \
__do_cancel (); \
@@ -308,8 +308,7 @@ extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex);
extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
extern int __pthread_mutex_lock_internal (pthread_mutex_t *__mutex)
attribute_hidden;
-extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex)
- attribute_hidden internal_function;
+extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex);
extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
extern int __pthread_mutex_unlock_internal (pthread_mutex_t *__mutex)
attribute_hidden;
diff --git a/libpthread/nptl/pthread_atfork.c b/libpthread/nptl/pthread_atfork.c
index 491362e19..5e9b35284 100644
--- a/libpthread/nptl/pthread_atfork.c
+++ b/libpthread/nptl/pthread_atfork.c
@@ -44,10 +44,10 @@ extern void *__dso_handle __attribute__ ((__weak__));
/* Hide the symbol so that no definition but the one locally in the
executable or DSO is used. */
int
-__pthread_atfork (prepare, parent, child)
- void (*prepare) (void);
- void (*parent) (void);
- void (*child) (void);
+__pthread_atfork (
+ void (*prepare) (void),
+ void (*parent) (void),
+ void (*child) (void))
{
return __register_atfork (prepare, parent, child,
&__dso_handle == NULL ? NULL : __dso_handle);
diff --git a/libpthread/nptl/pthread_attr_destroy.c b/libpthread/nptl/pthread_attr_destroy.c
index cae7ca0b1..f9e446a5c 100644
--- a/libpthread/nptl/pthread_attr_destroy.c
+++ b/libpthread/nptl/pthread_attr_destroy.c
@@ -24,8 +24,7 @@
#include "pthreadP.h"
int
-__pthread_attr_destroy (attr)
- pthread_attr_t *attr;
+__pthread_attr_destroy (pthread_attr_t *attr)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getdetachstate.c b/libpthread/nptl/pthread_attr_getdetachstate.c
index 502cfa4f1..db0720e7a 100644
--- a/libpthread/nptl/pthread_attr_getdetachstate.c
+++ b/libpthread/nptl/pthread_attr_getdetachstate.c
@@ -22,9 +22,7 @@
int
-__pthread_attr_getdetachstate (attr, detachstate)
- const pthread_attr_t *attr;
- int *detachstate;
+__pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getguardsize.c b/libpthread/nptl/pthread_attr_getguardsize.c
index e1d0ed624..6fc3e6af1 100644
--- a/libpthread/nptl/pthread_attr_getguardsize.c
+++ b/libpthread/nptl/pthread_attr_getguardsize.c
@@ -22,9 +22,7 @@
int
-pthread_attr_getguardsize (attr, guardsize)
- const pthread_attr_t *attr;
- size_t *guardsize;
+pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getinheritsched.c b/libpthread/nptl/pthread_attr_getinheritsched.c
index f47bf7147..3ff304094 100644
--- a/libpthread/nptl/pthread_attr_getinheritsched.c
+++ b/libpthread/nptl/pthread_attr_getinheritsched.c
@@ -22,9 +22,9 @@
int
-__pthread_attr_getinheritsched (attr, inherit)
- const pthread_attr_t *attr;
- int *inherit;
+__pthread_attr_getinheritsched (
+ const pthread_attr_t *attr,
+ int *inherit)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getschedparam.c b/libpthread/nptl/pthread_attr_getschedparam.c
index 0ff0c0c4f..82b237198 100644
--- a/libpthread/nptl/pthread_attr_getschedparam.c
+++ b/libpthread/nptl/pthread_attr_getschedparam.c
@@ -23,9 +23,9 @@
int
-__pthread_attr_getschedparam (attr, param)
- const pthread_attr_t *attr;
- struct sched_param *param;
+__pthread_attr_getschedparam (
+ const pthread_attr_t *attr,
+ struct sched_param *param)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getschedpolicy.c b/libpthread/nptl/pthread_attr_getschedpolicy.c
index 8364f3be0..7b8f1deb6 100644
--- a/libpthread/nptl/pthread_attr_getschedpolicy.c
+++ b/libpthread/nptl/pthread_attr_getschedpolicy.c
@@ -22,9 +22,9 @@
int
-__pthread_attr_getschedpolicy (attr, policy)
- const pthread_attr_t *attr;
- int *policy;
+__pthread_attr_getschedpolicy (
+ const pthread_attr_t *attr,
+ int *policy)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getscope.c b/libpthread/nptl/pthread_attr_getscope.c
index b6aa5a213..9b05ffaea 100644
--- a/libpthread/nptl/pthread_attr_getscope.c
+++ b/libpthread/nptl/pthread_attr_getscope.c
@@ -22,9 +22,9 @@
int
-__pthread_attr_getscope (attr, scope)
- const pthread_attr_t *attr;
- int *scope;
+__pthread_attr_getscope (
+ const pthread_attr_t *attr,
+ int *scope)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getstack.c b/libpthread/nptl/pthread_attr_getstack.c
index 1db135e5c..cb745368f 100644
--- a/libpthread/nptl/pthread_attr_getstack.c
+++ b/libpthread/nptl/pthread_attr_getstack.c
@@ -22,10 +22,10 @@
int
-__pthread_attr_getstack (attr, stackaddr, stacksize)
- const pthread_attr_t *attr;
- void **stackaddr;
- size_t *stacksize;
+__pthread_attr_getstack (
+ const pthread_attr_t *attr,
+ void **stackaddr,
+ size_t *stacksize)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getstackaddr.c b/libpthread/nptl/pthread_attr_getstackaddr.c
index 7656600dd..305910c16 100644
--- a/libpthread/nptl/pthread_attr_getstackaddr.c
+++ b/libpthread/nptl/pthread_attr_getstackaddr.c
@@ -23,9 +23,9 @@
int
-__pthread_attr_getstackaddr (attr, stackaddr)
- const pthread_attr_t *attr;
- void **stackaddr;
+__pthread_attr_getstackaddr (
+ const pthread_attr_t *attr,
+ void **stackaddr)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_getstacksize.c b/libpthread/nptl/pthread_attr_getstacksize.c
index d4ff54f38..ec20f6b96 100644
--- a/libpthread/nptl/pthread_attr_getstacksize.c
+++ b/libpthread/nptl/pthread_attr_getstacksize.c
@@ -22,9 +22,9 @@
int
-__pthread_attr_getstacksize (attr, stacksize)
- const pthread_attr_t *attr;
- size_t *stacksize;
+__pthread_attr_getstacksize (
+ const pthread_attr_t *attr,
+ size_t *stacksize)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_init.c b/libpthread/nptl/pthread_attr_init.c
index f07dfc7d9..161282c67 100644
--- a/libpthread/nptl/pthread_attr_init.c
+++ b/libpthread/nptl/pthread_attr_init.c
@@ -29,8 +29,7 @@ lll_lock_t __attr_list_lock = LLL_LOCK_INITIALIZER;
int
-__pthread_attr_init_2_1 (attr)
- pthread_attr_t *attr;
+__pthread_attr_init_2_1 (pthread_attr_t *attr)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setdetachstate.c b/libpthread/nptl/pthread_attr_setdetachstate.c
index a0e6c2017..b6d9bb52e 100644
--- a/libpthread/nptl/pthread_attr_setdetachstate.c
+++ b/libpthread/nptl/pthread_attr_setdetachstate.c
@@ -23,9 +23,7 @@
int
-__pthread_attr_setdetachstate (attr, detachstate)
- pthread_attr_t *attr;
- int detachstate;
+__pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setguardsize.c b/libpthread/nptl/pthread_attr_setguardsize.c
index 4c674f4df..a424312f2 100644
--- a/libpthread/nptl/pthread_attr_setguardsize.c
+++ b/libpthread/nptl/pthread_attr_setguardsize.c
@@ -22,9 +22,7 @@
int
-pthread_attr_setguardsize (attr, guardsize)
- pthread_attr_t *attr;
- size_t guardsize;
+pthread_attr_setguardsize (pthread_attr_t* attr, size_t guardsize)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setinheritsched.c b/libpthread/nptl/pthread_attr_setinheritsched.c
index 8a77eeb65..9d0234aaa 100644
--- a/libpthread/nptl/pthread_attr_setinheritsched.c
+++ b/libpthread/nptl/pthread_attr_setinheritsched.c
@@ -23,9 +23,9 @@
int
-__pthread_attr_setinheritsched (attr, inherit)
- pthread_attr_t *attr;
- int inherit;
+__pthread_attr_setinheritsched (
+ pthread_attr_t *attr,
+ int inherit)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setschedparam.c b/libpthread/nptl/pthread_attr_setschedparam.c
index 976ad1387..137fbe78c 100644
--- a/libpthread/nptl/pthread_attr_setschedparam.c
+++ b/libpthread/nptl/pthread_attr_setschedparam.c
@@ -24,9 +24,9 @@
int
-__pthread_attr_setschedparam (attr, param)
- pthread_attr_t *attr;
- const struct sched_param *param;
+__pthread_attr_setschedparam (
+ pthread_attr_t *attr,
+ const struct sched_param *param)
{
assert (sizeof (*attr) >= sizeof (struct pthread_attr));
struct pthread_attr *iattr = (struct pthread_attr *) attr;
diff --git a/libpthread/nptl/pthread_attr_setschedpolicy.c b/libpthread/nptl/pthread_attr_setschedpolicy.c
index b9710d57a..1d87b53c0 100644
--- a/libpthread/nptl/pthread_attr_setschedpolicy.c
+++ b/libpthread/nptl/pthread_attr_setschedpolicy.c
@@ -23,9 +23,9 @@
int
-__pthread_attr_setschedpolicy (attr, policy)
- pthread_attr_t *attr;
- int policy;
+__pthread_attr_setschedpolicy (
+ pthread_attr_t *attr,
+ int policy)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setscope.c b/libpthread/nptl/pthread_attr_setscope.c
index 8b3e1612e..cc4e46708 100644
--- a/libpthread/nptl/pthread_attr_setscope.c
+++ b/libpthread/nptl/pthread_attr_setscope.c
@@ -23,9 +23,9 @@
int
-__pthread_attr_setscope (attr, scope)
- pthread_attr_t *attr;
- int scope;
+__pthread_attr_setscope (
+ pthread_attr_t *attr,
+ int scope)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setstack.c b/libpthread/nptl/pthread_attr_setstack.c
index ba8fd0e59..80780a042 100644
--- a/libpthread/nptl/pthread_attr_setstack.c
+++ b/libpthread/nptl/pthread_attr_setstack.c
@@ -24,10 +24,10 @@
int
-__pthread_attr_setstack (attr, stackaddr, stacksize)
- pthread_attr_t *attr;
- void *stackaddr;
- size_t stacksize;
+__pthread_attr_setstack (
+ pthread_attr_t *attr,
+ void *stackaddr,
+ size_t stacksize)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setstackaddr.c b/libpthread/nptl/pthread_attr_setstackaddr.c
index 0d7a7c0eb..ead54baf0 100644
--- a/libpthread/nptl/pthread_attr_setstackaddr.c
+++ b/libpthread/nptl/pthread_attr_setstackaddr.c
@@ -23,9 +23,9 @@
int
-__pthread_attr_setstackaddr (attr, stackaddr)
- pthread_attr_t *attr;
- void *stackaddr;
+__pthread_attr_setstackaddr (
+ pthread_attr_t *attr,
+ void *stackaddr)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_attr_setstacksize.c b/libpthread/nptl/pthread_attr_setstacksize.c
index 98339b12d..24e5b0a72 100644
--- a/libpthread/nptl/pthread_attr_setstacksize.c
+++ b/libpthread/nptl/pthread_attr_setstacksize.c
@@ -24,9 +24,9 @@
int
-__pthread_attr_setstacksize (attr, stacksize)
- pthread_attr_t *attr;
- size_t stacksize;
+__pthread_attr_setstacksize (
+ pthread_attr_t *attr,
+ size_t stacksize)
{
struct pthread_attr *iattr;
diff --git a/libpthread/nptl/pthread_barrier_destroy.c b/libpthread/nptl/pthread_barrier_destroy.c
index 492b29485..628c1c378 100644
--- a/libpthread/nptl/pthread_barrier_destroy.c
+++ b/libpthread/nptl/pthread_barrier_destroy.c
@@ -23,8 +23,7 @@
int
-pthread_barrier_destroy (barrier)
- pthread_barrier_t *barrier;
+pthread_barrier_destroy (pthread_barrier_t *barrier)
{
struct pthread_barrier *ibarrier;
int result = EBUSY;
diff --git a/libpthread/nptl/pthread_barrier_init.c b/libpthread/nptl/pthread_barrier_init.c
index 19e82fa38..98a7ecc3f 100644
--- a/libpthread/nptl/pthread_barrier_init.c
+++ b/libpthread/nptl/pthread_barrier_init.c
@@ -23,10 +23,10 @@
int
-pthread_barrier_init (barrier, attr, count)
- pthread_barrier_t *barrier;
- const pthread_barrierattr_t *attr;
- unsigned int count;
+pthread_barrier_init (
+ pthread_barrier_t *barrier,
+ const pthread_barrierattr_t *attr,
+ unsigned int count)
{
struct pthread_barrier *ibarrier;
diff --git a/libpthread/nptl/pthread_barrierattr_destroy.c b/libpthread/nptl/pthread_barrierattr_destroy.c
index f947daf38..5cdcb76fb 100644
--- a/libpthread/nptl/pthread_barrierattr_destroy.c
+++ b/libpthread/nptl/pthread_barrierattr_destroy.c
@@ -21,8 +21,7 @@
int
-pthread_barrierattr_destroy (attr)
- pthread_barrierattr_t *attr;
+pthread_barrierattr_destroy (pthread_barrierattr_t *attr)
{
/* Nothing to do. */
diff --git a/libpthread/nptl/pthread_barrierattr_getpshared.c b/libpthread/nptl/pthread_barrierattr_getpshared.c
index 246c8882e..ee96c0224 100644
--- a/libpthread/nptl/pthread_barrierattr_getpshared.c
+++ b/libpthread/nptl/pthread_barrierattr_getpshared.c
@@ -21,9 +21,9 @@
int
-pthread_barrierattr_getpshared (attr, pshared)
- const pthread_barrierattr_t *attr;
- int *pshared;
+pthread_barrierattr_getpshared (
+ const pthread_barrierattr_t *attr,
+ int *pshared)
{
*pshared = ((const struct pthread_barrierattr *) attr)->pshared;
diff --git a/libpthread/nptl/pthread_barrierattr_init.c b/libpthread/nptl/pthread_barrierattr_init.c
index a0be9528b..17391f91c 100644
--- a/libpthread/nptl/pthread_barrierattr_init.c
+++ b/libpthread/nptl/pthread_barrierattr_init.c
@@ -21,8 +21,7 @@
int
-pthread_barrierattr_init (attr)
- pthread_barrierattr_t *attr;
+pthread_barrierattr_init (pthread_barrierattr_t *attr)
{
((struct pthread_barrierattr *) attr)->pshared = PTHREAD_PROCESS_PRIVATE;
diff --git a/libpthread/nptl/pthread_barrierattr_setpshared.c b/libpthread/nptl/pthread_barrierattr_setpshared.c
index b69f23ef1..fbf6fcb21 100644
--- a/libpthread/nptl/pthread_barrierattr_setpshared.c
+++ b/libpthread/nptl/pthread_barrierattr_setpshared.c
@@ -22,9 +22,9 @@
int
-pthread_barrierattr_setpshared (attr, pshared)
- pthread_barrierattr_t *attr;
- int pshared;
+pthread_barrierattr_setpshared (
+ pthread_barrierattr_t *attr,
+ int pshared)
{
struct pthread_barrierattr *iattr;
diff --git a/libpthread/nptl/pthread_cancel.c b/libpthread/nptl/pthread_cancel.c
index 0ea990693..31885234e 100644
--- a/libpthread/nptl/pthread_cancel.c
+++ b/libpthread/nptl/pthread_cancel.c
@@ -26,8 +26,7 @@
int
-pthread_cancel (th)
- pthread_t th;
+pthread_cancel (pthread_t th)
{
volatile struct pthread *pd = (volatile struct pthread *) th;
diff --git a/libpthread/nptl/pthread_cond_destroy.c b/libpthread/nptl/pthread_cond_destroy.c
index b7842d258..ebc6d78fc 100644
--- a/libpthread/nptl/pthread_cond_destroy.c
+++ b/libpthread/nptl/pthread_cond_destroy.c
@@ -22,8 +22,7 @@
int
-__pthread_cond_destroy (cond)
- pthread_cond_t *cond;
+__pthread_cond_destroy (pthread_cond_t *cond)
{
/* Make sure we are alone. */
lll_mutex_lock (cond->__data.__lock);
diff --git a/libpthread/nptl/pthread_cond_init.c b/libpthread/nptl/pthread_cond_init.c
index 5c3fd6853..bf2ab31e6 100644
--- a/libpthread/nptl/pthread_cond_init.c
+++ b/libpthread/nptl/pthread_cond_init.c
@@ -21,9 +21,9 @@
int
-__pthread_cond_init (cond, cond_attr)
- pthread_cond_t *cond;
- const pthread_condattr_t *cond_attr;
+__pthread_cond_init (
+ pthread_cond_t *cond,
+ const pthread_condattr_t *cond_attr)
{
struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr;
diff --git a/libpthread/nptl/pthread_condattr_destroy.c b/libpthread/nptl/pthread_condattr_destroy.c
index e6d069e40..bdb644152 100644
--- a/libpthread/nptl/pthread_condattr_destroy.c
+++ b/libpthread/nptl/pthread_condattr_destroy.c
@@ -21,8 +21,7 @@
int
-__pthread_condattr_destroy (attr)
- pthread_condattr_t *attr;
+__pthread_condattr_destroy (pthread_condattr_t *attr)
{
/* Nothing to be done. */
return 0;
diff --git a/libpthread/nptl/pthread_condattr_getclock.c b/libpthread/nptl/pthread_condattr_getclock.c
index 84de918a5..056515b1c 100644
--- a/libpthread/nptl/pthread_condattr_getclock.c
+++ b/libpthread/nptl/pthread_condattr_getclock.c
@@ -21,9 +21,9 @@
int
-pthread_condattr_getclock (attr, clock_id)
- const pthread_condattr_t *attr;
- clockid_t *clock_id;
+pthread_condattr_getclock (
+ const pthread_condattr_t *attr,
+ clockid_t *clock_id)
{
*clock_id = (((((const struct pthread_condattr *) attr)->value) >> 1)
& ((1 << COND_CLOCK_BITS) - 1));
diff --git a/libpthread/nptl/pthread_condattr_getpshared.c b/libpthread/nptl/pthread_condattr_getpshared.c
index b44eac94e..a558fdb8e 100644
--- a/libpthread/nptl/pthread_condattr_getpshared.c
+++ b/libpthread/nptl/pthread_condattr_getpshared.c
@@ -21,9 +21,9 @@
int
-pthread_condattr_getpshared (attr, pshared)
- const pthread_condattr_t *attr;
- int *pshared;
+pthread_condattr_getpshared (
+ const pthread_condattr_t *attr,
+ int *pshared)
{
*pshared = ((const struct pthread_condattr *) attr)->value & 1;
diff --git a/libpthread/nptl/pthread_condattr_init.c b/libpthread/nptl/pthread_condattr_init.c
index 738deb489..d22ca1e1d 100644
--- a/libpthread/nptl/pthread_condattr_init.c
+++ b/libpthread/nptl/pthread_condattr_init.c
@@ -22,8 +22,7 @@
int
-__pthread_condattr_init (attr)
- pthread_condattr_t *attr;
+__pthread_condattr_init (pthread_condattr_t *attr)
{
memset (attr, '\0', sizeof (*attr));
diff --git a/libpthread/nptl/pthread_condattr_setclock.c b/libpthread/nptl/pthread_condattr_setclock.c
index 6dc25636a..32b60cfac 100644
--- a/libpthread/nptl/pthread_condattr_setclock.c
+++ b/libpthread/nptl/pthread_condattr_setclock.c
@@ -27,9 +27,9 @@
int
-pthread_condattr_setclock (attr, clock_id)
- pthread_condattr_t *attr;
- clockid_t clock_id;
+pthread_condattr_setclock (
+ pthread_condattr_t *attr,
+ clockid_t clock_id)
{
/* Only a few clocks are allowed. CLOCK_REALTIME is always allowed.
CLOCK_MONOTONIC only if the kernel has the necessary support. */
diff --git a/libpthread/nptl/pthread_condattr_setpshared.c b/libpthread/nptl/pthread_condattr_setpshared.c
index f00858780..f3d39aa2b 100644
--- a/libpthread/nptl/pthread_condattr_setpshared.c
+++ b/libpthread/nptl/pthread_condattr_setpshared.c
@@ -21,9 +21,9 @@
#include <pthreadP.h>
int
-pthread_condattr_setpshared (attr, pshared)
- pthread_condattr_t *attr;
- int pshared;
+pthread_condattr_setpshared (
+ pthread_condattr_t *attr,
+ int pshared)
{
if (pshared != PTHREAD_PROCESS_PRIVATE
&& __builtin_expect (pshared != PTHREAD_PROCESS_SHARED, 0))
diff --git a/libpthread/nptl/pthread_detach.c b/libpthread/nptl/pthread_detach.c
index 1f0c2fe7c..054d7793a 100644
--- a/libpthread/nptl/pthread_detach.c
+++ b/libpthread/nptl/pthread_detach.c
@@ -23,8 +23,7 @@
int
-pthread_detach (th)
- pthread_t th;
+pthread_detach (pthread_t th)
{
struct pthread *pd = (struct pthread *) th;
diff --git a/libpthread/nptl/pthread_equal.c b/libpthread/nptl/pthread_equal.c
index c9986096f..8587e0f52 100644
--- a/libpthread/nptl/pthread_equal.c
+++ b/libpthread/nptl/pthread_equal.c
@@ -21,9 +21,7 @@
int
-__pthread_equal (thread1, thread2)
- pthread_t thread1;
- pthread_t thread2;
+__pthread_equal (pthread_t thread1, pthread_t thread2)
{
return thread1 == thread2;
}
diff --git a/libpthread/nptl/pthread_exit.c b/libpthread/nptl/pthread_exit.c
index 85d8fd456..a8c92fd29 100644
--- a/libpthread/nptl/pthread_exit.c
+++ b/libpthread/nptl/pthread_exit.c
@@ -22,8 +22,7 @@
void
-__pthread_exit (value)
- void *value;
+__pthread_exit (void* value)
{
THREAD_SETMEM (THREAD_SELF, result, value);
diff --git a/libpthread/nptl/pthread_getattr_np.c b/libpthread/nptl/pthread_getattr_np.c
index 8819731ab..00b9ba357 100644
--- a/libpthread/nptl/pthread_getattr_np.c
+++ b/libpthread/nptl/pthread_getattr_np.c
@@ -31,9 +31,9 @@
int
-pthread_getattr_np (thread_id, attr)
- pthread_t thread_id;
- pthread_attr_t *attr;
+pthread_getattr_np (
+ pthread_t thread_id,
+ pthread_attr_t *attr)
{
struct pthread *thread = (struct pthread *) thread_id;
struct pthread_attr *iattr = (struct pthread_attr *) attr;
diff --git a/libpthread/nptl/pthread_getschedparam.c b/libpthread/nptl/pthread_getschedparam.c
index 10ad27142..2dd33acc0 100644
--- a/libpthread/nptl/pthread_getschedparam.c
+++ b/libpthread/nptl/pthread_getschedparam.c
@@ -24,10 +24,10 @@
int
-__pthread_getschedparam (threadid, policy, param)
- pthread_t threadid;
- int *policy;
- struct sched_param *param;
+__pthread_getschedparam (
+ pthread_t threadid,
+ int *policy,
+ struct sched_param *param)
{
struct pthread *pd = (struct pthread *) threadid;
diff --git a/libpthread/nptl/pthread_getspecific.c b/libpthread/nptl/pthread_getspecific.c
index afb4d26ff..62c48fe8e 100644
--- a/libpthread/nptl/pthread_getspecific.c
+++ b/libpthread/nptl/pthread_getspecific.c
@@ -22,8 +22,7 @@
void *
-__pthread_getspecific (key)
- pthread_key_t key;
+__pthread_getspecific (pthread_key_t key)
{
struct pthread_key_data *data;
diff --git a/libpthread/nptl/pthread_join.c b/libpthread/nptl/pthread_join.c
index f94128dd9..977dbcff4 100644
--- a/libpthread/nptl/pthread_join.c
+++ b/libpthread/nptl/pthread_join.c
@@ -32,9 +32,7 @@ cleanup (void *arg)
int
-pthread_join (threadid, thread_return)
- pthread_t threadid;
- void **thread_return;
+pthread_join (pthread_t threadid, void **thread_return)
{
struct pthread *self;
struct pthread *pd = (struct pthread *) threadid;
diff --git a/libpthread/nptl/pthread_key_create.c b/libpthread/nptl/pthread_key_create.c
index cf35bc877..88d160e18 100644
--- a/libpthread/nptl/pthread_key_create.c
+++ b/libpthread/nptl/pthread_key_create.c
@@ -25,9 +25,9 @@
lll_lock_t __pthread_keys_lock = LLL_LOCK_INITIALIZER;
int
-__pthread_key_create (key, destr)
- pthread_key_t *key;
- void (*destr) (void *);
+__pthread_key_create (
+ pthread_key_t *key,
+ void (*destr) (void *))
{
int result = EAGAIN;
size_t cnt;
diff --git a/libpthread/nptl/pthread_key_delete.c b/libpthread/nptl/pthread_key_delete.c
index ae7d7c459..cb408f095 100644
--- a/libpthread/nptl/pthread_key_delete.c
+++ b/libpthread/nptl/pthread_key_delete.c
@@ -23,8 +23,7 @@
int
-pthread_key_delete (key)
- pthread_key_t key;
+pthread_key_delete (pthread_key_t key)
{
int result = EINVAL;
diff --git a/libpthread/nptl/pthread_mutex_destroy.c b/libpthread/nptl/pthread_mutex_destroy.c
index 9e63ba263..05bd96a3c 100644
--- a/libpthread/nptl/pthread_mutex_destroy.c
+++ b/libpthread/nptl/pthread_mutex_destroy.c
@@ -22,8 +22,7 @@
int
-__pthread_mutex_destroy (mutex)
- pthread_mutex_t *mutex;
+__pthread_mutex_destroy (pthread_mutex_t *mutex)
{
if (mutex->__data.__nusers != 0)
return EBUSY;
diff --git a/libpthread/nptl/pthread_mutex_init.c b/libpthread/nptl/pthread_mutex_init.c
index 5058fcc5f..2349497fe 100644
--- a/libpthread/nptl/pthread_mutex_init.c
+++ b/libpthread/nptl/pthread_mutex_init.c
@@ -30,9 +30,9 @@ static const struct pthread_mutexattr default_attr =
int
-__pthread_mutex_init (mutex, mutexattr)
- pthread_mutex_t *mutex;
- const pthread_mutexattr_t *mutexattr;
+__pthread_mutex_init (
+ pthread_mutex_t *mutex,
+ const pthread_mutexattr_t *mutexattr)
{
const struct pthread_mutexattr *imutexattr;
diff --git a/libpthread/nptl/pthread_mutex_lock.c b/libpthread/nptl/pthread_mutex_lock.c
index ee39f2082..faa5391dd 100644
--- a/libpthread/nptl/pthread_mutex_lock.c
+++ b/libpthread/nptl/pthread_mutex_lock.c
@@ -30,8 +30,7 @@
int
-__pthread_mutex_lock (mutex)
- pthread_mutex_t *mutex;
+__pthread_mutex_lock (pthread_mutex_t *mutex)
{
assert (sizeof (mutex->__size) >= sizeof (mutex->__data));
diff --git a/libpthread/nptl/pthread_mutex_timedlock.c b/libpthread/nptl/pthread_mutex_timedlock.c
index 1cd2c7e60..6f3df6ff0 100644
--- a/libpthread/nptl/pthread_mutex_timedlock.c
+++ b/libpthread/nptl/pthread_mutex_timedlock.c
@@ -23,9 +23,9 @@
int
-pthread_mutex_timedlock (mutex, abstime)
- pthread_mutex_t *mutex;
- const struct timespec *abstime;
+pthread_mutex_timedlock (
+ pthread_mutex_t *mutex,
+ const struct timespec *abstime)
{
pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
int result = 0;
diff --git a/libpthread/nptl/pthread_mutex_trylock.c b/libpthread/nptl/pthread_mutex_trylock.c
index 7008af3d9..2eb88db53 100644
--- a/libpthread/nptl/pthread_mutex_trylock.c
+++ b/libpthread/nptl/pthread_mutex_trylock.c
@@ -23,8 +23,7 @@
int
-__pthread_mutex_trylock (mutex)
- pthread_mutex_t *mutex;
+__pthread_mutex_trylock (pthread_mutex_t *mutex)
{
pid_t id;
diff --git a/libpthread/nptl/pthread_mutex_unlock.c b/libpthread/nptl/pthread_mutex_unlock.c
index 32bc2a4bc..0cb6df36c 100644
--- a/libpthread/nptl/pthread_mutex_unlock.c
+++ b/libpthread/nptl/pthread_mutex_unlock.c
@@ -24,9 +24,9 @@
int
internal_function attribute_hidden
-__pthread_mutex_unlock_usercnt (mutex, decr)
- pthread_mutex_t *mutex;
- int decr;
+__pthread_mutex_unlock_usercnt (
+ pthread_mutex_t *mutex,
+ int decr)
{
switch (__builtin_expect (mutex->__data.__kind, PTHREAD_MUTEX_TIMED_NP))
{
@@ -69,8 +69,7 @@ __pthread_mutex_unlock_usercnt (mutex, decr)
int
-__pthread_mutex_unlock (mutex)
- pthread_mutex_t *mutex;
+__pthread_mutex_unlock (pthread_mutex_t *mutex)
{
return __pthread_mutex_unlock_usercnt (mutex, 1);
}
diff --git a/libpthread/nptl/pthread_mutexattr_destroy.c b/libpthread/nptl/pthread_mutexattr_destroy.c
index eab27d351..adf2884bf 100644
--- a/libpthread/nptl/pthread_mutexattr_destroy.c
+++ b/libpthread/nptl/pthread_mutexattr_destroy.c
@@ -21,8 +21,7 @@
int
-__pthread_mutexattr_destroy (attr)
- pthread_mutexattr_t *attr;
+__pthread_mutexattr_destroy (pthread_mutexattr_t *attr)
{
return 0;
}
diff --git a/libpthread/nptl/pthread_mutexattr_getpshared.c b/libpthread/nptl/pthread_mutexattr_getpshared.c
index 4bd4ea18d..12de51662 100644
--- a/libpthread/nptl/pthread_mutexattr_getpshared.c
+++ b/libpthread/nptl/pthread_mutexattr_getpshared.c
@@ -21,9 +21,9 @@
int
-pthread_mutexattr_getpshared (attr, pshared)
- const pthread_mutexattr_t *attr;
- int *pshared;
+pthread_mutexattr_getpshared (
+ const pthread_mutexattr_t *attr,
+ int *pshared)
{
const struct pthread_mutexattr *iattr;
diff --git a/libpthread/nptl/pthread_mutexattr_gettype.c b/libpthread/nptl/pthread_mutexattr_gettype.c
index 5c32b2c6f..0f380a939 100644
--- a/libpthread/nptl/pthread_mutexattr_gettype.c
+++ b/libpthread/nptl/pthread_mutexattr_gettype.c
@@ -21,9 +21,9 @@
int
-pthread_mutexattr_gettype (attr, kind)
- const pthread_mutexattr_t *attr;
- int *kind;
+pthread_mutexattr_gettype (
+ const pthread_mutexattr_t *attr,
+ int *kind)
{
const struct pthread_mutexattr *iattr;
diff --git a/libpthread/nptl/pthread_mutexattr_init.c b/libpthread/nptl/pthread_mutexattr_init.c
index ee026c654..ce8080d59 100644
--- a/libpthread/nptl/pthread_mutexattr_init.c
+++ b/libpthread/nptl/pthread_mutexattr_init.c
@@ -22,8 +22,7 @@
int
-__pthread_mutexattr_init (attr)
- pthread_mutexattr_t *attr;
+__pthread_mutexattr_init (pthread_mutexattr_t *attr)
{
if (sizeof (struct pthread_mutexattr) != sizeof (pthread_mutexattr_t))
memset (attr, '\0', sizeof (*attr));
diff --git a/libpthread/nptl/pthread_mutexattr_setpshared.c b/libpthread/nptl/pthread_mutexattr_setpshared.c
index 5f2cf417e..74df1bfdd 100644
--- a/libpthread/nptl/pthread_mutexattr_setpshared.c
+++ b/libpthread/nptl/pthread_mutexattr_setpshared.c
@@ -22,9 +22,9 @@
int
-pthread_mutexattr_setpshared (attr, pshared)
- pthread_mutexattr_t *attr;
- int pshared;
+pthread_mutexattr_setpshared (
+ pthread_mutexattr_t *attr,
+ int pshared)
{
struct pthread_mutexattr *iattr;
diff --git a/libpthread/nptl/pthread_mutexattr_settype.c b/libpthread/nptl/pthread_mutexattr_settype.c
index c77fe79df..aaeec8120 100644
--- a/libpthread/nptl/pthread_mutexattr_settype.c
+++ b/libpthread/nptl/pthread_mutexattr_settype.c
@@ -22,9 +22,9 @@
int
-__pthread_mutexattr_settype (attr, kind)
- pthread_mutexattr_t *attr;
- int kind;
+__pthread_mutexattr_settype (
+ pthread_mutexattr_t *attr,
+ int kind)
{
struct pthread_mutexattr *iattr;
diff --git a/libpthread/nptl/pthread_rwlock_destroy.c b/libpthread/nptl/pthread_rwlock_destroy.c
index 28fd24b55..d38202b43 100644
--- a/libpthread/nptl/pthread_rwlock_destroy.c
+++ b/libpthread/nptl/pthread_rwlock_destroy.c
@@ -21,8 +21,7 @@
int
-__pthread_rwlock_destroy (rwlock)
- pthread_rwlock_t *rwlock;
+__pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
{
/* Nothing to be done. For now. */
return 0;
diff --git a/libpthread/nptl/pthread_rwlock_init.c b/libpthread/nptl/pthread_rwlock_init.c
index f664dd810..8055960e0 100644
--- a/libpthread/nptl/pthread_rwlock_init.c
+++ b/libpthread/nptl/pthread_rwlock_init.c
@@ -28,9 +28,9 @@ static const struct pthread_rwlockattr default_attr =
int
-__pthread_rwlock_init (rwlock, attr)
- pthread_rwlock_t *rwlock;
- const pthread_rwlockattr_t *attr;
+__pthread_rwlock_init (
+ pthread_rwlock_t *rwlock,
+ const pthread_rwlockattr_t *attr)
{
const struct pthread_rwlockattr *iattr;
diff --git a/libpthread/nptl/pthread_rwlock_tryrdlock.c b/libpthread/nptl/pthread_rwlock_tryrdlock.c
index 446af0596..0a9c815e0 100644
--- a/libpthread/nptl/pthread_rwlock_tryrdlock.c
+++ b/libpthread/nptl/pthread_rwlock_tryrdlock.c
@@ -23,8 +23,7 @@
int
-__pthread_rwlock_tryrdlock (rwlock)
- pthread_rwlock_t *rwlock;
+__pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
{
int result = EBUSY;
diff --git a/libpthread/nptl/pthread_rwlock_trywrlock.c b/libpthread/nptl/pthread_rwlock_trywrlock.c
index b754a1956..47150c154 100644
--- a/libpthread/nptl/pthread_rwlock_trywrlock.c
+++ b/libpthread/nptl/pthread_rwlock_trywrlock.c
@@ -23,8 +23,7 @@
int
-__pthread_rwlock_trywrlock (rwlock)
- pthread_rwlock_t *rwlock;
+__pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
{
int result = EBUSY;
diff --git a/libpthread/nptl/pthread_rwlockattr_destroy.c b/libpthread/nptl/pthread_rwlockattr_destroy.c
index 4f0c2c4fe..db1870413 100644
--- a/libpthread/nptl/pthread_rwlockattr_destroy.c
+++ b/libpthread/nptl/pthread_rwlockattr_destroy.c
@@ -21,8 +21,7 @@
int
-pthread_rwlockattr_destroy (attr)
- pthread_rwlockattr_t *attr;
+pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr)
{
/* Nothing to do. For now. */
diff --git a/libpthread/nptl/pthread_rwlockattr_getkind_np.c b/libpthread/nptl/pthread_rwlockattr_getkind_np.c
index aad9468fd..b15275c4d 100644
--- a/libpthread/nptl/pthread_rwlockattr_getkind_np.c
+++ b/libpthread/nptl/pthread_rwlockattr_getkind_np.c
@@ -21,9 +21,9 @@
int
-pthread_rwlockattr_getkind_np (attr, pref)
- const pthread_rwlockattr_t *attr;
- int *pref;
+pthread_rwlockattr_getkind_np (
+ const pthread_rwlockattr_t *attr,
+ int *pref)
{
*pref = ((const struct pthread_rwlockattr *) attr)->lockkind;
diff --git a/libpthread/nptl/pthread_rwlockattr_getpshared.c b/libpthread/nptl/pthread_rwlockattr_getpshared.c
index 3a776835a..2e0437c78 100644
--- a/libpthread/nptl/pthread_rwlockattr_getpshared.c
+++ b/libpthread/nptl/pthread_rwlockattr_getpshared.c
@@ -21,9 +21,9 @@
int
-pthread_rwlockattr_getpshared (attr, pshared)
- const pthread_rwlockattr_t *attr;
- int *pshared;
+pthread_rwlockattr_getpshared (
+ const pthread_rwlockattr_t *attr,
+ int *pshared)
{
*pshared = ((const struct pthread_rwlockattr *) attr)->pshared;
diff --git a/libpthread/nptl/pthread_rwlockattr_init.c b/libpthread/nptl/pthread_rwlockattr_init.c
index b29953455..b33ae5bff 100644
--- a/libpthread/nptl/pthread_rwlockattr_init.c
+++ b/libpthread/nptl/pthread_rwlockattr_init.c
@@ -21,8 +21,7 @@
int
-pthread_rwlockattr_init (attr)
- pthread_rwlockattr_t *attr;
+pthread_rwlockattr_init (pthread_rwlockattr_t *attr)
{
struct pthread_rwlockattr *iattr;
diff --git a/libpthread/nptl/pthread_rwlockattr_setkind_np.c b/libpthread/nptl/pthread_rwlockattr_setkind_np.c
index 0311f1b50..186bf737b 100644
--- a/libpthread/nptl/pthread_rwlockattr_setkind_np.c
+++ b/libpthread/nptl/pthread_rwlockattr_setkind_np.c
@@ -22,9 +22,9 @@
int
-pthread_rwlockattr_setkind_np (attr, pref)
- pthread_rwlockattr_t *attr;
- int pref;
+pthread_rwlockattr_setkind_np (
+ pthread_rwlockattr_t *attr,
+ int pref)
{
struct pthread_rwlockattr *iattr;
diff --git a/libpthread/nptl/pthread_rwlockattr_setpshared.c b/libpthread/nptl/pthread_rwlockattr_setpshared.c
index 9438d2931..a30de0eeb 100644
--- a/libpthread/nptl/pthread_rwlockattr_setpshared.c
+++ b/libpthread/nptl/pthread_rwlockattr_setpshared.c
@@ -22,9 +22,9 @@
int
-pthread_rwlockattr_setpshared (attr, pshared)
- pthread_rwlockattr_t *attr;
- int pshared;
+pthread_rwlockattr_setpshared (
+ pthread_rwlockattr_t *attr,
+ int pshared)
{
struct pthread_rwlockattr *iattr;
diff --git a/libpthread/nptl/pthread_setcancelstate.c b/libpthread/nptl/pthread_setcancelstate.c
index a452c2ec4..e53b52d67 100644
--- a/libpthread/nptl/pthread_setcancelstate.c
+++ b/libpthread/nptl/pthread_setcancelstate.c
@@ -23,9 +23,9 @@
int
-__pthread_setcancelstate (state, oldstate)
- int state;
- int *oldstate;
+__pthread_setcancelstate (
+ int state,
+ int *oldstate)
{
volatile struct pthread *self;
diff --git a/libpthread/nptl/pthread_setcanceltype.c b/libpthread/nptl/pthread_setcanceltype.c
index bbe87ba64..47c104b02 100644
--- a/libpthread/nptl/pthread_setcanceltype.c
+++ b/libpthread/nptl/pthread_setcanceltype.c
@@ -23,9 +23,9 @@
int
-__pthread_setcanceltype (type, oldtype)
- int type;
- int *oldtype;
+__pthread_setcanceltype (
+ int type,
+ int *oldtype)
{
volatile struct pthread *self;
diff --git a/libpthread/nptl/pthread_setconcurrency.c b/libpthread/nptl/pthread_setconcurrency.c
index 8cf150713..754fe3f25 100644
--- a/libpthread/nptl/pthread_setconcurrency.c
+++ b/libpthread/nptl/pthread_setconcurrency.c
@@ -26,8 +26,7 @@ int __concurrency_level;
int
-pthread_setconcurrency (level)
- int level;
+pthread_setconcurrency (int level)
{
if (level < 0)
return EINVAL;
diff --git a/libpthread/nptl/pthread_setschedparam.c b/libpthread/nptl/pthread_setschedparam.c
index 71c2f9b77..55dfefc52 100644
--- a/libpthread/nptl/pthread_setschedparam.c
+++ b/libpthread/nptl/pthread_setschedparam.c
@@ -25,10 +25,10 @@
int
-__pthread_setschedparam (threadid, policy, param)
- pthread_t threadid;
- int policy;
- const struct sched_param *param;
+__pthread_setschedparam (
+ pthread_t threadid,
+ int policy,
+ const struct sched_param *param)
{
struct pthread *pd = (struct pthread *) threadid;
diff --git a/libpthread/nptl/pthread_setschedprio.c b/libpthread/nptl/pthread_setschedprio.c
index e7ea4b76f..d5e30e5cb 100644
--- a/libpthread/nptl/pthread_setschedprio.c
+++ b/libpthread/nptl/pthread_setschedprio.c
@@ -26,9 +26,7 @@
int
-pthread_setschedprio (threadid, prio)
- pthread_t threadid;
- int prio;
+pthread_setschedprio (pthread_t threadid, int prio)
{
struct pthread *pd = (struct pthread *) threadid;
diff --git a/libpthread/nptl/pthread_setspecific.c b/libpthread/nptl/pthread_setspecific.c
index b6e66b5f2..8761eb99a 100644
--- a/libpthread/nptl/pthread_setspecific.c
+++ b/libpthread/nptl/pthread_setspecific.c
@@ -23,9 +23,9 @@
int
-__pthread_setspecific (key, value)
- pthread_key_t key;
- const void *value;
+__pthread_setspecific (
+ pthread_key_t key,
+ const void *value)
{
struct pthread *self;
unsigned int idx1st;
diff --git a/libpthread/nptl/pthread_timedjoin.c b/libpthread/nptl/pthread_timedjoin.c
index 1cc07213c..ce2cf3f65 100644
--- a/libpthread/nptl/pthread_timedjoin.c
+++ b/libpthread/nptl/pthread_timedjoin.c
@@ -31,10 +31,10 @@ cleanup (void *arg)
int
-pthread_timedjoin_np (threadid, thread_return, abstime)
- pthread_t threadid;
- void **thread_return;
- const struct timespec *abstime;
+pthread_timedjoin_np (
+ pthread_t threadid,
+ void **thread_return,
+ const struct timespec *abstime)
{
struct pthread *self;
struct pthread *pd = (struct pthread *) threadid;
diff --git a/libpthread/nptl/pthread_tryjoin.c b/libpthread/nptl/pthread_tryjoin.c
index 904cb5280..049cb5e0a 100644
--- a/libpthread/nptl/pthread_tryjoin.c
+++ b/libpthread/nptl/pthread_tryjoin.c
@@ -25,9 +25,7 @@
int
-pthread_tryjoin_np (threadid, thread_return)
- pthread_t threadid;
- void **thread_return;
+pthread_tryjoin_np (pthread_t threadid, void **thread_return)
{
struct pthread *self;
struct pthread *pd = (struct pthread *) threadid;
diff --git a/libpthread/nptl/sem_close.c b/libpthread/nptl/sem_close.c
index 279522d08..a2bcc7179 100644
--- a/libpthread/nptl/sem_close.c
+++ b/libpthread/nptl/sem_close.c
@@ -41,8 +41,7 @@ walker (const void *inodep, const VISIT which, const int depth)
int
-sem_close (sem)
- sem_t *sem;
+sem_close (sem_t *sem)
{
int result = 0;
diff --git a/libpthread/nptl/sem_destroy.c b/libpthread/nptl/sem_destroy.c
index 1fdb7b5b7..2e612c13d 100644
--- a/libpthread/nptl/sem_destroy.c
+++ b/libpthread/nptl/sem_destroy.c
@@ -22,8 +22,7 @@
int
-__new_sem_destroy (sem)
- sem_t *sem;
+__new_sem_destroy (sem_t *sem)
{
/* XXX Check for valid parameter. */
diff --git a/libpthread/nptl/sem_getvalue.c b/libpthread/nptl/sem_getvalue.c
index c03827b00..5e6c8df42 100644
--- a/libpthread/nptl/sem_getvalue.c
+++ b/libpthread/nptl/sem_getvalue.c
@@ -22,9 +22,9 @@
int
-__new_sem_getvalue (sem, sval)
- sem_t *sem;
- int *sval;
+__new_sem_getvalue (
+ sem_t *sem,
+ int *sval)
{
struct sem *isem = (struct sem *) sem;
diff --git a/libpthread/nptl/sem_init.c b/libpthread/nptl/sem_init.c
index 0fbdf594e..1439bd053 100644
--- a/libpthread/nptl/sem_init.c
+++ b/libpthread/nptl/sem_init.c
@@ -24,10 +24,10 @@
int
-__new_sem_init (sem, pshared, value)
- sem_t *sem;
- int pshared;
- unsigned int value;
+__new_sem_init (
+ sem_t *sem,
+ int pshared,
+ unsigned int value)
{
/* Parameter sanity check. */
if (__builtin_expect (value > SEM_VALUE_MAX, 0))
diff --git a/libpthread/nptl/sem_unlink.c b/libpthread/nptl/sem_unlink.c
index 5f24fd35b..e52a08d15 100644
--- a/libpthread/nptl/sem_unlink.c
+++ b/libpthread/nptl/sem_unlink.c
@@ -26,8 +26,7 @@
int
-sem_unlink (name)
- const char *name;
+sem_unlink (const char *name)
{
char *fname;
size_t namelen;
diff --git a/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h
index 5cef8b1cf..b9528f363 100644
--- a/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h
+++ b/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h
@@ -28,4 +28,5 @@
((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj))
/* We use the normal lobngjmp for unwinding. */
+extern __typeof(longjmp) __libc_longjmp attribute_noreturn;
#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val)
diff --git a/libpthread/nptl/sysdeps/i386/pthread_spin_lock.c b/libpthread/nptl/sysdeps/i386/pthread_spin_lock.c
index da859cc9f..a6b1cf403 100644
--- a/libpthread/nptl/sysdeps/i386/pthread_spin_lock.c
+++ b/libpthread/nptl/sysdeps/i386/pthread_spin_lock.c
@@ -29,8 +29,7 @@
int
-pthread_spin_lock (lock)
- pthread_spinlock_t *lock;
+pthread_spin_lock (pthread_spinlock_t *lock)
{
__asm__ ("\n"
"1:\t" LOCK_PREFIX "decl %0\n\t"
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c
index db9dc4dcd..1f4136e70 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c
@@ -38,10 +38,10 @@ struct _condvar_cleanup_buffer
};
int
-__pthread_cond_timedwait (cond, mutex, abstime)
- pthread_cond_t *cond;
- pthread_mutex_t *mutex;
- const struct timespec *abstime;
+__pthread_cond_timedwait (
+ pthread_cond_t *cond,
+ pthread_mutex_t *mutex,
+ const struct timespec *abstime)
{
struct _pthread_cleanup_buffer buffer;
struct _condvar_cleanup_buffer cbuffer;
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c
index b0fe694ba..79245b7c1 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c
@@ -81,9 +81,9 @@ __condvar_cleanup (void *arg)
int
-__pthread_cond_wait (cond, mutex)
- pthread_cond_t *cond;
- pthread_mutex_t *mutex;
+__pthread_cond_wait (
+ pthread_cond_t *cond,
+ pthread_mutex_t *mutex)
{
struct _pthread_cleanup_buffer buffer;
struct _condvar_cleanup_buffer cbuffer;
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_sigmask.c b/libpthread/nptl/sysdeps/pthread/pthread_sigmask.c
index 0d12fe6bf..6f66bbbff 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_sigmask.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_sigmask.c
@@ -24,10 +24,10 @@
int
-pthread_sigmask (how, newmask, oldmask)
- int how;
- const sigset_t *newmask;
- sigset_t *oldmask;
+pthread_sigmask (
+ int how,
+ const sigset_t *newmask,
+ sigset_t *oldmask)
{
sigset_t local_newmask;
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c b/libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c
index 4d0109cf0..62082f44e 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c
+++ b/libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c
@@ -21,8 +21,7 @@
int
-pthread_spin_destroy (lock)
- pthread_spinlock_t *lock;
+pthread_spin_destroy (pthread_spinlock_t *lock)
{
/* Nothing to do. */
return 0;
diff --git a/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h
index b9528f363..71a358209 100644
--- a/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h
+++ b/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h
@@ -27,6 +27,6 @@
#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \
((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj))
-/* We use the normal lobngjmp for unwinding. */
+/* We use the normal longjmp for unwinding. */
extern __typeof(longjmp) __libc_longjmp attribute_noreturn;
#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index 1a060c0f4..1033ebc2d 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -173,7 +173,7 @@ extern int __lll_mutex_unlock_wake (int *__futex)
#define lll_mutex_timedlock(futex, timeout) \
- ({ int result, ignore1, ignore2; \
+ ({ int _result, ignore1, ignore2; \
__asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %3\n\t" \
"jnz _L_mutex_timedlock_%=\n\t" \
".subsection 1\n\t" \
@@ -186,11 +186,11 @@ extern int __lll_mutex_unlock_wake (int *__futex)
".size _L_mutex_timedlock_%=,.-_L_mutex_timedlock_%=\n"\
".previous\n" \
"1:" \
- : "=a" (result), "=c" (ignore1), "=&d" (ignore2), \
+ : "=a" (_result), "=c" (ignore1), "=&d" (ignore2), \
"=m" (futex) \
: "0" (0), "1" (1), "m" (futex), "m" (timeout) \
: "memory"); \
- result; })
+ _result; })
#define lll_mutex_unlock(futex) \
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
index 104472468..8d887e020 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
@@ -26,9 +26,9 @@
int
-__pthread_kill (threadid, signo)
- pthread_t threadid;
- int signo;
+__pthread_kill (
+ pthread_t threadid,
+ int signo)
{
struct pthread *pd = (struct pthread *) threadid;
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c
index 09a571659..9f02fe3b2 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c
@@ -49,10 +49,10 @@ int __no_posix_timers attribute_hidden;
int
-timer_create (clock_id, evp, timerid)
- clockid_t clock_id;
- struct sigevent *evp;
- timer_t *timerid;
+timer_create (
+ clockid_t clock_id,
+ struct sigevent *evp,
+ timer_t *timerid)
{
# undef timer_create
# ifndef __ASSUME_POSIX_TIMERS
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c
index 3ebbbce30..9b92446d5 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c
@@ -39,8 +39,7 @@ static int compat_timer_delete (timer_t timerid);
int
-timer_delete (timerid)
- timer_t timerid;
+timer_delete (timer_t timerid)
{
# undef timer_delete
# ifndef __ASSUME_POSIX_TIMERS
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c
index 4c97f97ce..7afc5ec6f 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c
@@ -38,8 +38,7 @@ static int compat_timer_getoverrun (timer_t timerid);
int
-timer_getoverrun (timerid)
- timer_t timerid;
+timer_getoverrun (timer_t timerid)
{
# undef timer_getoverrun
# ifndef __ASSUME_POSIX_TIMERS
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c
index 3ce0916a8..31401b19b 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c
@@ -39,9 +39,9 @@ static int compat_timer_gettime (timer_t timerid, struct itimerspec *value);
int
-timer_gettime (timerid, value)
- timer_t timerid;
- struct itimerspec *value;
+timer_gettime (
+ timer_t timerid,
+ struct itimerspec *value)
{
# undef timer_gettime
# ifndef __ASSUME_POSIX_TIMERS
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c
index 558c63f26..8c6ad91fa 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c
@@ -41,11 +41,11 @@ static int compat_timer_settime (timer_t timerid, int flags,
int
-timer_settime (timerid, flags, value, ovalue)
- timer_t timerid;
- int flags;
- const struct itimerspec *value;
- struct itimerspec *ovalue;
+timer_settime (
+ timer_t timerid,
+ int flags,
+ const struct itimerspec *value,
+ struct itimerspec *ovalue)
{
# undef timer_settime
# ifndef __ASSUME_POSIX_TIMERS
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index 694cbf448..35cd868d0 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -143,7 +143,7 @@ extern int __lll_mutex_unlock_wait (int *__futex) attribute_hidden;
#define lll_mutex_timedlock(futex, timeout) \
- ({ int result, ignore1, ignore2, ignore3; \
+ ({ int _result, ignore1, ignore2, ignore3; \
__asm __volatile (LOCK_INSTR "cmpxchgl %2, %4\n\t" \
"jnz 1f\n\t" \
".subsection 1\n" \
@@ -155,11 +155,11 @@ extern int __lll_mutex_unlock_wait (int *__futex) attribute_hidden;
"jmp 2f\n\t" \
".previous\n" \
"2:" \
- : "=a" (result), "=&D" (ignore1), "=S" (ignore2), \
+ : "=a" (_result), "=&D" (ignore1), "=S" (ignore2), \
"=&d" (ignore3), "=m" (futex) \
: "0" (0), "2" (1), "m" (futex), "m" (timeout) \
: "memory", "cx", "cc", "r10", "r11"); \
- result; })
+ _result; })
#define lll_mutex_unlock(futex) \
--
cgit v1.2.3