@@ -24,8 +24,7 @@
int
-pthread_cancel (th)
- pthread_t th;
+pthread_cancel (pthread_t th)
{
volatile struct pthread *pd = (volatile struct pthread *) th;
@@ -48,10 +48,8 @@ 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;
@@ -98,9 +98,7 @@ __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;
@@ -21,8 +21,7 @@
void
-__pthread_exit (value)
- void *value;
+__pthread_exit (void *value)
{
THREAD_SETMEM (THREAD_SELF, result, value);
@@ -37,9 +37,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 *pd = (struct pthread *) threadid;
@@ -30,10 +30,8 @@ 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;
@@ -149,11 +149,7 @@ OUR_WAITID (idtype_t idtype, id_t id, siginfo_t *infop, int options)
int
-__waitid (idtype, id, infop, options)
- idtype_t idtype;
- id_t id;
- siginfo_t *infop;
- int options;
+__waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
{
if (SINGLE_THREAD_P)
return do_waitid (idtype, id, infop, options);
@@ -24,11 +24,7 @@
#include <sys/syscall.h>
ssize_t
-__libc_pread (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off_t offset;
+__libc_pread (int fd, void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -24,11 +24,7 @@
#include <sys/syscall.h>
ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
+__libc_pread64 (int fd, void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -24,11 +24,7 @@
#include <sys/syscall.h>
ssize_t
-__libc_pwrite (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off_t offset;
+__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -24,11 +24,7 @@
#include <sys/syscall.h>
ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
+__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -35,11 +35,7 @@ do_pread (int fd, void *buf, size_t count, off_t offset)
}
ssize_t
-__libc_pread (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off_t offset;
+__libc_pread (int fd, void *buf, size_t count, off_t offset)
{
if (SINGLE_THREAD_P)
return do_pread (fd, buf, count, offset);
@@ -35,11 +35,7 @@ do_pread64 (int fd, void *buf, size_t count, off64_t offset)
ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
+__libc_pread64 (int fd, void *buf, size_t count, off64_t offset)
{
if (SINGLE_THREAD_P)
return do_pread64 (fd, buf, count, offset);
@@ -36,11 +36,7 @@ do_pwrite (int fd, const void *buf, size_t count, off_t offset)
ssize_t
-__libc_pwrite (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off_t offset;
+__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
{
if (SINGLE_THREAD_P)
return do_pwrite (fd, buf, count, offset);
@@ -35,11 +35,7 @@ do_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
+__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
{
if (SINGLE_THREAD_P)
return do_pwrite64 (fd, buf, count, offset);
@@ -36,11 +36,7 @@
ssize_t
-__libc_pread (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off_t offset;
+__libc_pread (int fd, void *buf, size_t count, off_t offset):
{
ssize_t result;
@@ -35,11 +35,7 @@
ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
+__libc_pread64 (int fd, void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -36,11 +36,7 @@
ssize_t
-__libc_pwrite (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off_t offset;
+__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -35,11 +35,7 @@
ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
+__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -33,12 +33,8 @@ struct ipc_kludge
ssize_t
-__libc_msgrcv (msqid, msgp, msgsz, msgtyp, msgflg)
- int msqid;
- void *msgp;
- size_t msgsz;
- long int msgtyp;
- int msgflg;
+__libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
+ int msgflg)
{
/* The problem here is that Linux' calling convention only allows up to
fives parameters to a system call. */
@@ -24,11 +24,7 @@
#include <sys/syscall.h>
int
-__libc_msgsnd (msqid, msgp, msgsz, msgflg)
- int msqid;
- const void *msgp;
- size_t msgsz;
- int msgflg;
+__libc_msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg)
{
if (SINGLE_THREAD_P)
return INLINE_SYSCALL (ipc, 5, IPCOP_msgsnd, msqid, msgsz,
@@ -37,11 +37,7 @@
int
-OPENAT_NOT_CANCEL (fd, file, oflag, mode)
- int fd;
- const char *file;
- int oflag;
- mode_t mode;
+OPENAT_NOT_CANCEL (int fd, const char *file, int oflag, mode_t mode)
{
/* We have to add the O_LARGEFILE flag for openat64. */
@@ -61,10 +57,7 @@ OPENAT_NOT_CANCEL (fd, file, oflag, mode)
the directory associated with FD. If OFLAG includes O_CREAT, a
third argument is the file protection. */
int
-__OPENAT (fd, file, oflag)
- int fd;
- const char *file;
- int oflag;
+__OPENAT (int fd, const char *file, int oflag, ...)
{
mode_t mode = 0;
if (oflag & O_CREAT)
@@ -24,11 +24,7 @@
#include <sys/syscall.h>
ssize_t
-__libc_pread (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off_t offset;
+__libc_pread (int fd, void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -24,11 +24,7 @@
ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
+__libc_pread64 (int fd, void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -25,11 +25,7 @@
ssize_t
-__libc_pwrite (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off_t offset;
+__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -24,11 +24,7 @@
ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
+__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -27,11 +27,7 @@
/* Consider moving to syscalls.list. */
ssize_t
-__libc_pread (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off_t offset;
+__libc_pread (int fd, void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -26,11 +26,7 @@
/* Consider moving to syscalls.list. */
ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
+__libc_pread64 (int fd, void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -27,11 +27,7 @@
/* Consider moving to syscalls.list. */
ssize_t
-__libc_pwrite (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off_t offset;
+__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -26,11 +26,7 @@
/* Consider moving to syscalls.list. */
ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
+__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -49,11 +49,7 @@ do_pread (int fd, void *buf, size_t count, off_t offset)
ssize_t
-__libc_pread (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off_t offset;
+__libc_pread (int fd, void *buf, size_t count, off_t offset)
{
if (SINGLE_THREAD_P)
return do_pread (fd, buf, count, offset);
@@ -45,11 +45,7 @@ do_pread64 (int fd, void *buf, size_t count, off64_t offset)
ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
+__libc_pread64 (int fd, void *buf, size_t count, off64_t offset)
{
if (SINGLE_THREAD_P)
return do_pread64 (fd, buf, count, offset);
@@ -48,11 +48,7 @@ static ssize_t PREADV_REPLACEMENT (int, const struct iovec *,
ssize_t
-PREADV (fd, vector, count, offset)
- int fd;
- const struct iovec *vector;
- int count;
- OFF_T offset;
+PREADV (int fd, const struct iovec *vector, int count, OFF_T offset)
{
#ifdef __NR_preadv
ssize_t result;
@@ -24,9 +24,7 @@
int
-__pthread_kill (threadid, signo)
- pthread_t threadid;
- int signo;
+__pthread_kill (pthread_t threadid, int signo)
{
struct pthread *pd = (struct pthread *) threadid;
@@ -49,11 +49,7 @@ do_pwrite (int fd, const void *buf, size_t count, off_t offset)
ssize_t
-__libc_pwrite (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off_t offset;
+__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
{
if (SINGLE_THREAD_P)
return do_pwrite (fd, buf, count, offset);
@@ -45,11 +45,7 @@ do_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
+__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
{
if (SINGLE_THREAD_P)
return do_pwrite64 (fd, buf, count, offset);
@@ -48,11 +48,7 @@ static ssize_t PWRITEV_REPLACEMENT (int, const struct iovec *,
ssize_t
-PWRITEV (fd, vector, count, offset)
- int fd;
- const struct iovec *vector;
- int count;
- OFF_T offset;
+PWRITEV (int fd, const struct iovec *vector, int count, OFF_T offset)
{
#ifdef __NR_pwritev
ssize_t result;
@@ -27,10 +27,7 @@
/* Consider moving to syscalls.list. */
ssize_t
-__libc_readv (fd, vector, count)
- int fd;
- const struct iovec *vector;
- int count;
+__libc_readv (int fd, const struct iovec *vector, int count)
{
ssize_t result;
@@ -33,11 +33,7 @@
ssize_t
-__libc_pread (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off_t offset;
+__libc_pread (int fd, void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -32,11 +32,7 @@
ssize_t
-__libc_pread64 (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off64_t offset;
+__libc_pread64 (int fd, void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -33,11 +33,7 @@
ssize_t
-__libc_pwrite (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off_t offset;
+__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
{
ssize_t result;
@@ -32,11 +32,7 @@
ssize_t
-__libc_pwrite64 (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off64_t offset;
+__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
{
ssize_t result;
@@ -32,8 +32,7 @@ do_sigsuspend (const sigset_t *set)
/* Change the set of blocked signals to SET,
wait until a signal arrives, and restore the set of blocked signals. */
int
-__sigsuspend (set)
- const sigset_t *set;
+__sigsuspend (const sigset_t *set)
{
if (SINGLE_THREAD_P)
return do_sigsuspend (set);
@@ -67,10 +67,8 @@ do_sigtimedwait (const sigset_t *set, siginfo_t *info,
/* Return any pending signal or wait for one for the given time. */
int
-__sigtimedwait (set, info, timeout)
- const sigset_t *set;
- siginfo_t *info;
- const struct timespec *timeout;
+__sigtimedwait (const sigset_t *set, siginfo_t *info,
+ const struct timespec *timeout)
{
if (SINGLE_THREAD_P)
return do_sigtimedwait (set, info, timeout);
@@ -86,9 +86,7 @@ do_sigwait (const sigset_t *set, int *sig)
}
int
-__sigwait (set, sig)
- const sigset_t *set;
- int *sig;
+__sigwait (const sigset_t *set, int *sig)
{
if (SINGLE_THREAD_P)
return do_sigwait (set, sig);
@@ -68,9 +68,7 @@ do_sigwaitinfo (const sigset_t *set, siginfo_t *info)
/* Return any pending signal or wait for one for the given time. */
int
-__sigwaitinfo (set, info)
- const sigset_t *set;
- siginfo_t *info;
+__sigwaitinfo (const sigset_t *set, siginfo_t *info)
{
if (SINGLE_THREAD_P)
return do_sigwaitinfo (set, info);
@@ -23,12 +23,8 @@
#include <sys/syscall.h>
ssize_t
-__libc_msgrcv (msqid, msgp, msgsz, msgtyp, msgflg)
- int msqid;
- void *msgp;
- size_t msgsz;
- long int msgtyp;
- int msgflg;
+__libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
+ int msgflg)
{
if (SINGLE_THREAD_P)
return INLINE_SYSCALL (ipc, 6, IPCOP_msgrcv, msqid, msgsz, msgflg,
@@ -28,10 +28,7 @@
/* Consider moving to syscalls.list. */
ssize_t
-__libc_writev (fd, vector, count)
- int fd;
- const struct iovec *vector;
- int count;
+__libc_writev (int fd, const struct iovec *vector, int count)
{
ssize_t result;