This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-433-gf63f2bf
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 19 Oct 2015 21:24:14 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-433-gf63f2bf
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via f63f2bfdfaad591305863a79c4fd2c3f50015f26 (commit)
from 6ab674ebff5e60c62b126d0ac2e774e581916afe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f63f2bfdfaad591305863a79c4fd2c3f50015f26
commit f63f2bfdfaad591305863a79c4fd2c3f50015f26
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Oct 19 21:23:47 2015 +0000
Convert 69 more function definitions to prototype style (line wrap cases).
This automatically-generated patch converts 69 function definitions in
glibc from old-style K&R to prototype-style.
This patch, covering both sysdeps and non-sysdeps files, deals with
cases where the prototype needed to be wrapped over more than one
line. Otherwise, exclusions and caveats are as for
<https://sourceware.org/ml/libc-alpha/2015-10/msg00594.html> and
<https://sourceware.org/ml/libc-alpha/2015-10/msg00599.html>.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* crypt/crypt-entry.c (__crypt_r): Convert to prototype-style
function definition.
* crypt/crypt_util.c (__encrypt_r): Likewise.
* libio/genops.c (_IO_no_init): Likewise.
* libio/iofopncook.c (_IO_fopencookie): Likewise.
(_IO_old_fopencookie): Likewise.
* libio/iofwrite_u.c (fwrite_unlocked): Likewise.
* libio/iogetline.c (_IO_getline): Likewise.
(_IO_getline_info): Likewise.
* libio/iogetwline.c (_IO_getwline): Likewise.
(_IO_getwline_info): Likewise.
* libio/vsnprintf.c (_IO_vsnprintf): Likewise.
* libio/vswprintf.c (_IO_vswprintf): Likewise.
* locale/programs/simple-hash.c (insert_entry_2): Likewise.
(find_entry): Likewise.
(iterate_table): Likewise.
(lookup): Likewise.
* login/forkpty.c (forkpty): Likewise.
* misc/hsearch_r.c (__hsearch_r): Likewise.
* misc/select.c (__select): Likewise.
* nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore):
Likewise.
* nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0):
Likewise.
* nptl/old_pthread_cond_timedwait.c
(__pthread_cond_timedwait_2_0): Likewise.
* nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise.
* nptl/pthread_barrierattr_getpshared.c
(pthread_barrierattr_getpshared): Likewise.
* nptl/pthread_getschedparam.c (__pthread_getschedparam):
Likewise.
* nptl/pthread_mutex_setprioceiling.c
(pthread_mutex_setprioceiling): Likewise.
* nptl/pthread_mutexattr_getprioceiling.c
(pthread_mutexattr_getprioceiling): Likewise.
* nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise.
* nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock):
Likewise.
* nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock):
Likewise.
* nptl/pthread_setschedparam.c (__pthread_setschedparam):
Likewise.
* socket/recvfrom.c (__recvfrom): Likewise.
* socket/sendto.c (__sendto): Likewise.
* socket/setsockopt.c (__setsockopt): Likewise.
* stdio-common/_itoa.c (_itoa): Likewise.
* stdio-common/_itowa.c (_itowa): Likewise.
* stdio-common/reg-printf.c (__register_printf_specifier):
Likewise.
(__register_printf_function): Likewise.
* stdio-common/tempname.c (__path_search): Likewise.
* stdlib/addmul_1.c (mpn_addmul_1): Likewise.
* stdlib/mul_1.c (mpn_mul_1): Likewise.
* stdlib/random_r.c (__initstate_r): Likewise.
* stdlib/setenv.c (__add_to_environ): Likewise.
* stdlib/submul_1.c (mpn_submul_1): Likewise.
* streams/getpmsg.c (getpmsg): Likewise.
* streams/putmsg.c (putmsg): Likewise.
* streams/putpmsg.c (putpmsg): Likewise.
* sunrpc/clnt_raw.c (clntraw_call): Likewise.
* sunrpc/clnt_tcp.c (clnttcp_call): Likewise.
* sunrpc/clnt_udp.c (clntudp_create): Likewise.
* sunrpc/clnt_unix.c (clntunix_call): Likewise.
* sunrpc/pm_getport.c (pmap_getport): Likewise.
* sunrpc/svc_udp.c (cache_get): Likewise.
* sunrpc/xdr_array.c (xdr_vector): Likewise.
* sysdeps/mach/hurd/getcwd.c
(__canonicalize_directory_name_internal): Likewise.
* sysdeps/mach/hurd/pselect.c (__pselect): Likewise.
* sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise.
* sysdeps/mach/hurd/select.c (__select): Likewise.
* sysdeps/posix/ttyname_r.c (getttyname_r): Likewise.
* sysdeps/pthread/timer_settime.c (timer_settime): Likewise.
* sysdeps/sparc/nptl/pthread_barrier_init.c
(__pthread_barrier_init): Likewise.
* sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
(__pthread_cond_timedwait): Likewise.
* sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise.
* sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop):
Likewise.
* sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise.
* sysdeps/unix/sysv/linux/timer_settime.c (timer_settime):
Likewise.
* sysvipc/semtimedop.c (semtimedop): Likewise.
* time/setitimer.c (__setitimer): Likewise.
* time/strftime_l.c (emacs_strftime): Likewise.
diff --git a/ChangeLog b/ChangeLog
index cc2e939..a4e316c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,92 @@
+2015-10-19 Joseph Myers <joseph@codesourcery.com>
+
+ * crypt/crypt-entry.c (__crypt_r): Convert to prototype-style
+ function definition.
+ * crypt/crypt_util.c (__encrypt_r): Likewise.
+ * libio/genops.c (_IO_no_init): Likewise.
+ * libio/iofopncook.c (_IO_fopencookie): Likewise.
+ (_IO_old_fopencookie): Likewise.
+ * libio/iofwrite_u.c (fwrite_unlocked): Likewise.
+ * libio/iogetline.c (_IO_getline): Likewise.
+ (_IO_getline_info): Likewise.
+ * libio/iogetwline.c (_IO_getwline): Likewise.
+ (_IO_getwline_info): Likewise.
+ * libio/vsnprintf.c (_IO_vsnprintf): Likewise.
+ * libio/vswprintf.c (_IO_vswprintf): Likewise.
+ * locale/programs/simple-hash.c (insert_entry_2): Likewise.
+ (find_entry): Likewise.
+ (iterate_table): Likewise.
+ (lookup): Likewise.
+ * login/forkpty.c (forkpty): Likewise.
+ * misc/hsearch_r.c (__hsearch_r): Likewise.
+ * misc/select.c (__select): Likewise.
+ * nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore):
+ Likewise.
+ * nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0):
+ Likewise.
+ * nptl/old_pthread_cond_timedwait.c
+ (__pthread_cond_timedwait_2_0): Likewise.
+ * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise.
+ * nptl/pthread_barrierattr_getpshared.c
+ (pthread_barrierattr_getpshared): Likewise.
+ * nptl/pthread_getschedparam.c (__pthread_getschedparam):
+ Likewise.
+ * nptl/pthread_mutex_setprioceiling.c
+ (pthread_mutex_setprioceiling): Likewise.
+ * nptl/pthread_mutexattr_getprioceiling.c
+ (pthread_mutexattr_getprioceiling): Likewise.
+ * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise.
+ * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock):
+ Likewise.
+ * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock):
+ Likewise.
+ * nptl/pthread_setschedparam.c (__pthread_setschedparam):
+ Likewise.
+ * socket/recvfrom.c (__recvfrom): Likewise.
+ * socket/sendto.c (__sendto): Likewise.
+ * socket/setsockopt.c (__setsockopt): Likewise.
+ * stdio-common/_itoa.c (_itoa): Likewise.
+ * stdio-common/_itowa.c (_itowa): Likewise.
+ * stdio-common/reg-printf.c (__register_printf_specifier):
+ Likewise.
+ (__register_printf_function): Likewise.
+ * stdio-common/tempname.c (__path_search): Likewise.
+ * stdlib/addmul_1.c (mpn_addmul_1): Likewise.
+ * stdlib/mul_1.c (mpn_mul_1): Likewise.
+ * stdlib/random_r.c (__initstate_r): Likewise.
+ * stdlib/setenv.c (__add_to_environ): Likewise.
+ * stdlib/submul_1.c (mpn_submul_1): Likewise.
+ * streams/getpmsg.c (getpmsg): Likewise.
+ * streams/putmsg.c (putmsg): Likewise.
+ * streams/putpmsg.c (putpmsg): Likewise.
+ * sunrpc/clnt_raw.c (clntraw_call): Likewise.
+ * sunrpc/clnt_tcp.c (clnttcp_call): Likewise.
+ * sunrpc/clnt_udp.c (clntudp_create): Likewise.
+ * sunrpc/clnt_unix.c (clntunix_call): Likewise.
+ * sunrpc/pm_getport.c (pmap_getport): Likewise.
+ * sunrpc/svc_udp.c (cache_get): Likewise.
+ * sunrpc/xdr_array.c (xdr_vector): Likewise.
+ * sysdeps/mach/hurd/getcwd.c
+ (__canonicalize_directory_name_internal): Likewise.
+ * sysdeps/mach/hurd/pselect.c (__pselect): Likewise.
+ * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise.
+ * sysdeps/mach/hurd/select.c (__select): Likewise.
+ * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise.
+ * sysdeps/pthread/timer_settime.c (timer_settime): Likewise.
+ * sysdeps/sparc/nptl/pthread_barrier_init.c
+ (__pthread_barrier_init): Likewise.
+ * sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
+ (__pthread_cond_timedwait): Likewise.
+ * sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise.
+ * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop):
+ Likewise.
+ * sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise.
+ * sysdeps/unix/sysv/linux/timer_settime.c (timer_settime):
+ Likewise.
+ * sysvipc/semtimedop.c (semtimedop): Likewise.
+ * time/setitimer.c (__setitimer): Likewise.
+ * time/strftime_l.c (emacs_strftime): Likewise.
+
2015-10-19 Mike Frysinger <vapier@gentoo.org>
* config.make.in (have-ssp): Delete.
diff --git a/crypt/crypt-entry.c b/crypt/crypt-entry.c
index 73b369c..f7b3949 100644
--- a/crypt/crypt-entry.c
+++ b/crypt/crypt-entry.c
@@ -71,10 +71,8 @@ extern struct crypt_data _ufc_foobar;
*/
char *
-__crypt_r (key, salt, data)
- const char *key;
- const char *salt;
- struct crypt_data * __restrict data;
+__crypt_r (const char *key, const char *salt,
+ struct crypt_data * __restrict data)
{
ufc_long res[4];
char ktab[9];
diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
index 33d894a..f78861c 100644
--- a/crypt/crypt_util.c
+++ b/crypt/crypt_util.c
@@ -797,10 +797,8 @@ _ufc_output_conversion_r(v1, v2, salt, __data)
*/
void
-__encrypt_r(__block, __edflag, __data)
- char *__block;
- int __edflag;
- struct crypt_data * __restrict __data;
+__encrypt_r (char *__block, int __edflag,
+ struct crypt_data * __restrict __data)
{
ufc_long l1, l2, r1, r2, res[4];
int i;
diff --git a/libio/genops.c b/libio/genops.c
index 873bd77..377bda3 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -596,12 +596,8 @@ _IO_old_init (_IO_FILE *fp, int flags)
}
void
-_IO_no_init (fp, flags, orientation, wd, jmp)
- _IO_FILE *fp;
- int flags;
- int orientation;
- struct _IO_wide_data *wd;
- const struct _IO_jump_t *jmp;
+_IO_no_init (_IO_FILE *fp, int flags, int orientation,
+ struct _IO_wide_data *wd, const struct _IO_jump_t *jmp)
{
_IO_old_init (fp, flags);
fp->_mode = orientation;
diff --git a/libio/iofopncook.c b/libio/iofopncook.c
index b16a263..3998bc5 100644
--- a/libio/iofopncook.c
+++ b/libio/iofopncook.c
@@ -149,10 +149,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
_IO_FILE *
-_IO_fopencookie (cookie, mode, io_functions)
- void *cookie;
- const char *mode;
- _IO_cookie_io_functions_t io_functions;
+_IO_fopencookie (void *cookie, const char *mode,
+ _IO_cookie_io_functions_t io_functions)
{
int read_write;
struct locked_FILE
@@ -244,10 +242,8 @@ static const struct _IO_jump_t _IO_old_cookie_jumps = {
_IO_FILE *
attribute_compat_text_section
-_IO_old_fopencookie (cookie, mode, io_functions)
- void *cookie;
- const char *mode;
- _IO_cookie_io_functions_t io_functions;
+_IO_old_fopencookie (void *cookie, const char *mode,
+ _IO_cookie_io_functions_t io_functions)
{
_IO_FILE *ret;
diff --git a/libio/iofwrite_u.c b/libio/iofwrite_u.c
index 09bf9f5..2b1c47a 100644
--- a/libio/iofwrite_u.c
+++ b/libio/iofwrite_u.c
@@ -30,11 +30,8 @@
#undef fwrite_unlocked
_IO_size_t
-fwrite_unlocked (buf, size, count, fp)
- const void *buf;
- _IO_size_t size;
- _IO_size_t count;
- _IO_FILE *fp;
+fwrite_unlocked (const void *buf, _IO_size_t size, _IO_size_t count,
+ _IO_FILE *fp)
{
_IO_size_t request = size * count;
_IO_size_t written = 0;
diff --git a/libio/iogetline.c b/libio/iogetline.c
index 0d939ab..72d643f 100644
--- a/libio/iogetline.c
+++ b/libio/iogetline.c
@@ -28,12 +28,8 @@
#include <string.h>
_IO_size_t
-_IO_getline (fp, buf, n, delim, extract_delim)
- _IO_FILE *fp;
- char *buf;
- _IO_size_t n;
- int delim;
- int extract_delim;
+_IO_getline (_IO_FILE *fp, char *buf, _IO_size_t n, int delim,
+ int extract_delim)
{
return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0);
}
@@ -48,13 +44,8 @@ libc_hidden_def (_IO_getline)
If extract_delim > 0, insert delim in output. */
_IO_size_t
-_IO_getline_info (fp, buf, n, delim, extract_delim, eof)
- _IO_FILE *fp;
- char *buf;
- _IO_size_t n;
- int delim;
- int extract_delim;
- int *eof;
+_IO_getline_info (_IO_FILE *fp, char *buf, _IO_size_t n, int delim,
+ int extract_delim, int *eof)
{
char *ptr = buf;
if (eof != NULL)
diff --git a/libio/iogetwline.c b/libio/iogetwline.c
index b668a77..15fc0f3 100644
--- a/libio/iogetwline.c
+++ b/libio/iogetwline.c
@@ -33,12 +33,8 @@
#endif
_IO_size_t
-_IO_getwline (fp, buf, n, delim, extract_delim)
- _IO_FILE *fp;
- wchar_t *buf;
- _IO_size_t n;
- wint_t delim;
- int extract_delim;
+_IO_getwline (_IO_FILE *fp, wchar_t *buf, _IO_size_t n, wint_t delim,
+ int extract_delim)
{
return _IO_getwline_info (fp, buf, n, delim, extract_delim, (wint_t *) 0);
}
@@ -52,13 +48,8 @@ _IO_getwline (fp, buf, n, delim, extract_delim)
If extract_delim > 0, insert delim in output. */
_IO_size_t
-_IO_getwline_info (fp, buf, n, delim, extract_delim, eof)
- _IO_FILE *fp;
- wchar_t *buf;
- _IO_size_t n;
- wint_t delim;
- int extract_delim;
- wint_t *eof;
+_IO_getwline_info (_IO_FILE *fp, wchar_t *buf, _IO_size_t n, wint_t delim,
+ int extract_delim, wint_t *eof)
{
wchar_t *ptr = buf;
if (eof != NULL)
diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c
index fdceb3d..967b4e9 100644
--- a/libio/vsnprintf.c
+++ b/libio/vsnprintf.c
@@ -90,11 +90,8 @@ const struct _IO_jump_t _IO_strn_jumps attribute_hidden =
int
-_IO_vsnprintf (string, maxlen, format, args)
- char *string;
- _IO_size_t maxlen;
- const char *format;
- _IO_va_list args;
+_IO_vsnprintf (char *string, _IO_size_t maxlen, const char *format,
+ _IO_va_list args)
{
_IO_strnfile sf;
int ret;
diff --git a/libio/vswprintf.c b/libio/vswprintf.c
index 1533a6d..80f9688 100644
--- a/libio/vswprintf.c
+++ b/libio/vswprintf.c
@@ -89,11 +89,8 @@ const struct _IO_jump_t _IO_wstrn_jumps attribute_hidden =
int
-_IO_vswprintf (string, maxlen, format, args)
- wchar_t *string;
- _IO_size_t maxlen;
- const wchar_t *format;
- _IO_va_list args;
+_IO_vswprintf (wchar_t *string, _IO_size_t maxlen, const wchar_t *format,
+ _IO_va_list args)
{
_IO_wstrnfile sf;
int ret;
diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c
index 2c81185..4ce99c1 100644
--- a/locale/programs/simple-hash.c
+++ b/locale/programs/simple-hash.c
@@ -114,13 +114,8 @@ insert_entry (hash_table *htab, const void *key, size_t keylen, void *data)
}
static void
-insert_entry_2 (htab, key, keylen, hval, idx, data)
- hash_table *htab;
- const void *key;
- size_t keylen;
- unsigned long int hval;
- size_t idx;
- void *data;
+insert_entry_2 (hash_table *htab, const void *key, size_t keylen,
+ unsigned long int hval, size_t idx, void *data)
{
hash_entry *table = (hash_entry *) htab->table;
@@ -169,11 +164,8 @@ insert_entry_2 (htab, key, keylen, hval, idx, data)
int
-find_entry (htab, key, keylen, result)
- const hash_table *htab;
- const void *key;
- size_t keylen;
- void **result;
+find_entry (const hash_table *htab, const void *key, size_t keylen,
+ void **result)
{
hash_entry *table = (hash_entry *) htab->table;
size_t idx = lookup (htab, key, keylen, compute_hashval (key, keylen));
@@ -201,12 +193,8 @@ set_entry (hash_table *htab, const void *key, size_t keylen, void *newval)
int
-iterate_table (htab, ptr, key, keylen, data)
- const hash_table *htab;
- void **ptr;
- const void **key;
- size_t *keylen;
- void **data;
+iterate_table (const hash_table *htab, void **ptr, const void **key,
+ size_t *keylen, void **data)
{
if (*ptr == NULL)
{
@@ -233,11 +221,8 @@ iterate_table (htab, ptr, key, keylen, data)
[Knuth] The Art of Computer Programming, part3 (6.4) */
static size_t
-lookup (htab, key, keylen, hval)
- const hash_table *htab;
- const void *key;
- size_t keylen;
- unsigned long int hval;
+lookup (const hash_table *htab, const void *key, size_t keylen,
+ unsigned long int hval)
{
unsigned long int hash;
size_t idx;
diff --git a/login/forkpty.c b/login/forkpty.c
index ea3e209..881b62e 100644
--- a/login/forkpty.c
+++ b/login/forkpty.c
@@ -23,11 +23,8 @@
#include <pty.h>
int
-forkpty (amaster, name, termp, winp)
- int *amaster;
- char *name;
- const struct termios *termp;
- const struct winsize *winp;
+forkpty (int *amaster, char *name, const struct termios *termp,
+ const struct winsize *winp)
{
int master, slave, pid;
diff --git a/misc/hsearch_r.c b/misc/hsearch_r.c
index 9d6cd81..7bc04cf 100644
--- a/misc/hsearch_r.c
+++ b/misc/hsearch_r.c
@@ -142,11 +142,8 @@ weak_alias (__hdestroy_r, hdestroy_r)
equality of the stored and the parameter value. This helps to prevent
unnecessary expensive calls of strcmp. */
int
-__hsearch_r (item, action, retval, htab)
- ENTRY item;
- ACTION action;
- ENTRY **retval;
- struct hsearch_data *htab;
+__hsearch_r (ENTRY item, ACTION action, ENTRY **retval,
+ struct hsearch_data *htab)
{
unsigned int hval;
unsigned int count;
diff --git a/misc/select.c b/misc/select.c
index e5cd18e..a5c8dbe 100644
--- a/misc/select.c
+++ b/misc/select.c
@@ -25,12 +25,8 @@
after waiting the interval specified therein. Returns the number of ready
descriptors, or -1 for errors. */
int
-__select (nfds, readfds, writefds, exceptfds, timeout)
- int nfds;
- fd_set *readfds;
- fd_set *writefds;
- fd_set *exceptfds;
- struct timeval *timeout;
+__select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+ struct timeval *timeout)
{
__set_errno (ENOSYS);
return -1;
diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c
index bd70b89..e4fa87d 100644
--- a/nptl/cleanup_defer_compat.c
+++ b/nptl/cleanup_defer_compat.c
@@ -59,9 +59,8 @@ 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/nptl/old_pthread_cond_init.c b/nptl/old_pthread_cond_init.c
index 815e67e..f64095b 100644
--- a/nptl/old_pthread_cond_init.c
+++ b/nptl/old_pthread_cond_init.c
@@ -23,9 +23,8 @@
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
int
-__pthread_cond_init_2_0 (cond, cond_attr)
- pthread_cond_2_0_t *cond;
- const pthread_condattr_t *cond_attr;
+__pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
+ const pthread_condattr_t *cond_attr)
{
struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr;
diff --git a/nptl/old_pthread_cond_timedwait.c b/nptl/old_pthread_cond_timedwait.c
index 501f2ab..b98884f 100644
--- a/nptl/old_pthread_cond_timedwait.c
+++ b/nptl/old_pthread_cond_timedwait.c
@@ -25,10 +25,8 @@
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
int
-__pthread_cond_timedwait_2_0 (cond, mutex, abstime)
- pthread_cond_2_0_t *cond;
- pthread_mutex_t *mutex;
- const struct timespec *abstime;
+__pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
+ const struct timespec *abstime)
{
if (cond->cond == NULL)
{
diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c
index 8fe15ec..bf5b002 100644
--- a/nptl/pthread_barrier_init.c
+++ b/nptl/pthread_barrier_init.c
@@ -29,10 +29,8 @@ static const struct pthread_barrierattr default_barrierattr =
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/nptl/pthread_barrierattr_getpshared.c b/nptl/pthread_barrierattr_getpshared.c
index 174161f..de62be8 100644
--- a/nptl/pthread_barrierattr_getpshared.c
+++ b/nptl/pthread_barrierattr_getpshared.c
@@ -20,9 +20,8 @@
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/nptl/pthread_getschedparam.c b/nptl/pthread_getschedparam.c
index 5de8924..7c38223 100644
--- a/nptl/pthread_getschedparam.c
+++ b/nptl/pthread_getschedparam.c
@@ -23,10 +23,8 @@
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/nptl/pthread_mutex_setprioceiling.c b/nptl/pthread_mutex_setprioceiling.c
index 1be7471..0edaa24 100644
--- a/nptl/pthread_mutex_setprioceiling.c
+++ b/nptl/pthread_mutex_setprioceiling.c
@@ -24,10 +24,8 @@
int
-pthread_mutex_setprioceiling (mutex, prioceiling, old_ceiling)
- pthread_mutex_t *mutex;
- int prioceiling;
- int *old_ceiling;
+pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling,
+ int *old_ceiling)
{
/* The low bits of __kind aren't ever changed after pthread_mutex_init,
so we don't need a lock yet. */
diff --git a/nptl/pthread_mutexattr_getprioceiling.c b/nptl/pthread_mutexattr_getprioceiling.c
index 2f73ea2..7d52f7e 100644
--- a/nptl/pthread_mutexattr_getprioceiling.c
+++ b/nptl/pthread_mutexattr_getprioceiling.c
@@ -22,9 +22,8 @@
int
-pthread_mutexattr_getprioceiling (attr, prioceiling)
- const pthread_mutexattr_t *attr;
- int *prioceiling;
+pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr,
+ int *prioceiling)
{
const struct pthread_mutexattr *iattr;
int ceiling;
diff --git a/nptl/pthread_rwlock_init.c b/nptl/pthread_rwlock_init.c
index 99ab5e3..7483e5e 100644
--- a/nptl/pthread_rwlock_init.c
+++ b/nptl/pthread_rwlock_init.c
@@ -29,9 +29,8 @@ static const struct pthread_rwlockattr default_rwlockattr =
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/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c
index 93d235e..8ef1249 100644
--- a/nptl/pthread_rwlock_timedrdlock.c
+++ b/nptl/pthread_rwlock_timedrdlock.c
@@ -28,9 +28,8 @@
/* Try to acquire read lock for RWLOCK or return after specfied time. */
int
-pthread_rwlock_timedrdlock (rwlock, abstime)
- pthread_rwlock_t *rwlock;
- const struct timespec *abstime;
+pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
+ const struct timespec *abstime)
{
int result = 0;
bool wake = false;
diff --git a/nptl/pthread_rwlock_timedwrlock.c b/nptl/pthread_rwlock_timedwrlock.c
index 615623a..5ae6f6a 100644
--- a/nptl/pthread_rwlock_timedwrlock.c
+++ b/nptl/pthread_rwlock_timedwrlock.c
@@ -28,9 +28,8 @@
/* Try to acquire write lock for RWLOCK or return after specfied time. */
int
-pthread_rwlock_timedwrlock (rwlock, abstime)
- pthread_rwlock_t *rwlock;
- const struct timespec *abstime;
+pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
+ const struct timespec *abstime)
{
int result = 0;
bool wake_readers = false;
diff --git a/nptl/pthread_setschedparam.c b/nptl/pthread_setschedparam.c
index 41a629d..c52184f 100644
--- a/nptl/pthread_setschedparam.c
+++ b/nptl/pthread_setschedparam.c
@@ -24,10 +24,8 @@
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/socket/recvfrom.c b/socket/recvfrom.c
index 479350f..f8985fa 100644
--- a/socket/recvfrom.c
+++ b/socket/recvfrom.c
@@ -22,13 +22,8 @@
at address ADDR (which is ADDR_LEN bytes long).
Returns the number read or -1 for errors. */
ssize_t
-__recvfrom (fd, buf, n, flags, addr, addr_len)
- int fd;
- void *buf;
- size_t n;
- int flags;
- __SOCKADDR_ARG addr;
- socklen_t *addr_len;
+__recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addr,
+ socklen_t *addr_len)
{
__set_errno (ENOSYS);
return -1;
diff --git a/socket/sendto.c b/socket/sendto.c
index de2e523..0b9e4d2 100644
--- a/socket/sendto.c
+++ b/socket/sendto.c
@@ -21,13 +21,8 @@
/* Send N bytes of BUF on socket FD to peer at address ADDR (which is
ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */
ssize_t
-__sendto (fd, buf, n, flags, addr, addr_len)
- int fd;
- const __ptr_t buf;
- size_t n;
- int flags;
- __CONST_SOCKADDR_ARG addr;
- socklen_t addr_len;
+__sendto (int fd, const __ptr_t buf, size_t n, int flags,
+ __CONST_SOCKADDR_ARG addr, socklen_t addr_len)
{
__set_errno (ENOSYS);
return -1;
diff --git a/socket/setsockopt.c b/socket/setsockopt.c
index cf36f1c..e5985e9 100644
--- a/socket/setsockopt.c
+++ b/socket/setsockopt.c
@@ -22,12 +22,8 @@
to *OPTVAL (which is OPTLEN bytes long).
Returns 0 on success, -1 for errors. */
int
-__setsockopt (fd, level, optname, optval, optlen)
- int fd;
- int level;
- int optname;
- const __ptr_t optval;
- socklen_t optlen;
+__setsockopt (int fd, int level, int optname, const __ptr_t optval,
+ socklen_t optlen)
{
__set_errno (ENOSYS);
return -1;
diff --git a/stdio-common/_itoa.c b/stdio-common/_itoa.c
index a3ae5e1..84faae9 100644
--- a/stdio-common/_itoa.c
+++ b/stdio-common/_itoa.c
@@ -191,11 +191,8 @@ _itoa_word (_ITOA_WORD_TYPE value, char *buflim,
#if _ITOA_NEEDED
char *
-_itoa (value, buflim, base, upper_case)
- unsigned long long int value;
- char *buflim;
- unsigned int base;
- int upper_case;
+_itoa (unsigned long long int value, char *buflim, unsigned int base,
+ int upper_case)
{
const char *digits = (upper_case
? _itoa_upper_digits
diff --git a/stdio-common/_itowa.c b/stdio-common/_itowa.c
index dedf4b7..4e5aec7 100644
--- a/stdio-common/_itowa.c
+++ b/stdio-common/_itowa.c
@@ -87,11 +87,8 @@ extern const wchar_t _itowa_upper_digits[] attribute_hidden;
#if _ITOA_NEEDED
wchar_t *
-_itowa (value, buflim, base, upper_case)
- unsigned long long int value;
- wchar_t *buflim;
- unsigned int base;
- int upper_case;
+_itowa (unsigned long long int value, wchar_t *buflim, unsigned int base,
+ int upper_case)
{
const wchar_t *digits = (upper_case
? _itowa_upper_digits : _itowa_lower_digits);
diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index ed326e2..7df1bb0 100644
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -38,10 +38,8 @@ int __register_printf_function (int, printf_function,
/* Register FUNC to be called to format SPEC specifiers. */
int
-__register_printf_specifier (spec, converter, arginfo)
- int spec;
- printf_function converter;
- printf_arginfo_size_function arginfo;
+__register_printf_specifier (int spec, printf_function converter,
+ printf_arginfo_size_function arginfo)
{
if (spec < 0 || spec > (int) UCHAR_MAX)
{
@@ -79,10 +77,8 @@ weak_alias (__register_printf_specifier, register_printf_specifier)
/* Register FUNC to be called to format SPEC specifiers. */
int
-__register_printf_function (spec, converter, arginfo)
- int spec;
- printf_function converter;
- printf_arginfo_function arginfo;
+__register_printf_function (int spec, printf_function converter,
+ printf_arginfo_function arginfo)
{
return __register_printf_specifier (spec, converter,
(printf_arginfo_size_function*) arginfo);
diff --git a/stdio-common/tempname.c b/stdio-common/tempname.c
index 4aef3bc..8525ab6 100644
--- a/stdio-common/tempname.c
+++ b/stdio-common/tempname.c
@@ -24,12 +24,8 @@
template suitable for use in __gen_tempname into TMPL, bounded
by TMPL_LEN. */
int
-__path_search (tmpl, tmpl_len, dir, pfx, try_tmpdir)
- char *tmpl;
- size_t tmpl_len;
- const char *dir;
- const char *pfx;
- int try_tmpdir;
+__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
+ int try_tmpdir)
{
__set_errno (ENOSYS);
return -1;
diff --git a/stdlib/addmul_1.c b/stdlib/addmul_1.c
index 47b9db3..b1e8731 100644
--- a/stdlib/addmul_1.c
+++ b/stdlib/addmul_1.c
@@ -26,11 +26,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see
#include "longlong.h"
mp_limb_t
-mpn_addmul_1 (res_ptr, s1_ptr, s1_size, s2_limb)
- register mp_ptr res_ptr;
- register mp_srcptr s1_ptr;
- mp_size_t s1_size;
- register mp_limb_t s2_limb;
+mpn_addmul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,
+ mp_size_t s1_size, register mp_limb_t s2_limb)
{
register mp_limb_t cy_limb;
register mp_size_t j;
diff --git a/stdlib/mul_1.c b/stdlib/mul_1.c
index f31acc1..b5c7758 100644
--- a/stdlib/mul_1.c
+++ b/stdlib/mul_1.c
@@ -24,11 +24,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see
#include "longlong.h"
mp_limb_t
-mpn_mul_1 (res_ptr, s1_ptr, s1_size, s2_limb)
- register mp_ptr res_ptr;
- register mp_srcptr s1_ptr;
- mp_size_t s1_size;
- register mp_limb_t s2_limb;
+mpn_mul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,
+ mp_size_t s1_size, register mp_limb_t s2_limb)
{
register mp_limb_t cy_limb;
register mp_size_t j;
diff --git a/stdlib/random_r.c b/stdlib/random_r.c
index 059f7af..6beb8c4 100644
--- a/stdlib/random_r.c
+++ b/stdlib/random_r.c
@@ -227,11 +227,8 @@ weak_alias (__srandom_r, srandom_r)
setstate so that it doesn't matter when initstate is called.
Returns 0 on success, non-zero on failure. */
int
-__initstate_r (seed, arg_state, n, buf)
- unsigned int seed;
- char *arg_state;
- size_t n;
- struct random_data *buf;
+__initstate_r (unsigned int seed, char *arg_state, size_t n,
+ struct random_data *buf)
{
if (buf == NULL)
goto fail;
diff --git a/stdlib/setenv.c b/stdlib/setenv.c
index d39eed3..4064a52 100644
--- a/stdlib/setenv.c
+++ b/stdlib/setenv.c
@@ -117,11 +117,8 @@ static char **last_environ;
to reuse values once generated for a `setenv' call since we can never
free the strings. */
int
-__add_to_environ (name, value, combined, replace)
- const char *name;
- const char *value;
- const char *combined;
- int replace;
+__add_to_environ (const char *name, const char *value, const char *combined,
+ int replace)
{
char **ep;
size_t size;
diff --git a/stdlib/submul_1.c b/stdlib/submul_1.c
index b3f5c94..5e4f504 100644
--- a/stdlib/submul_1.c
+++ b/stdlib/submul_1.c
@@ -26,11 +26,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see
#include "longlong.h"
mp_limb_t
-mpn_submul_1 (res_ptr, s1_ptr, s1_size, s2_limb)
- register mp_ptr res_ptr;
- register mp_srcptr s1_ptr;
- mp_size_t s1_size;
- register mp_limb_t s2_limb;
+mpn_submul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,
+ mp_size_t s1_size, register mp_limb_t s2_limb)
{
register mp_limb_t cy_limb;
register mp_size_t j;
diff --git a/streams/getpmsg.c b/streams/getpmsg.c
index 7e8c872..f3cba36 100644
--- a/streams/getpmsg.c
+++ b/streams/getpmsg.c
@@ -19,12 +19,8 @@
#include <stropts.h>
int
-getpmsg (fildes, ctlptr, dataptr, bandp, flagsp)
- int fildes;
- struct strbuf *ctlptr;
- struct strbuf *dataptr;
- int *bandp;
- int *flagsp;
+getpmsg (int fildes, struct strbuf *ctlptr, struct strbuf *dataptr, int *bandp,
+ int *flagsp)
{
__set_errno (ENOSYS);
return -1;
diff --git a/streams/putmsg.c b/streams/putmsg.c
index 9197f7e..03c6997 100644
--- a/streams/putmsg.c
+++ b/streams/putmsg.c
@@ -19,11 +19,8 @@
#include <stropts.h>
int
-putmsg (fildes, ctlptr, dataptr, flags)
- int fildes;
- const struct strbuf *ctlptr;
- const struct strbuf *dataptr;
- int flags;
+putmsg (int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr,
+ int flags)
{
__set_errno (ENOSYS);
return -1;
diff --git a/streams/putpmsg.c b/streams/putpmsg.c
index e9fbd0f..c54b6f7 100644
--- a/streams/putpmsg.c
+++ b/streams/putpmsg.c
@@ -19,12 +19,8 @@
#include <stropts.h>
int
-putpmsg (fildes, ctlptr, dataptr, band, flags)
- int fildes;
- const struct strbuf *ctlptr;
- const struct strbuf *dataptr;
- int band;
- int flags;
+putpmsg (int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr,
+ int band, int flags)
{
__set_errno (ENOSYS);
return -1;
diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
index 6653ee4..a149bf4 100644
--- a/sunrpc/clnt_raw.c
+++ b/sunrpc/clnt_raw.c
@@ -132,14 +132,8 @@ clntraw_create (u_long prog, u_long vers)
libc_hidden_nolink_sunrpc (clntraw_create, GLIBC_2_0)
static enum clnt_stat
-clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout)
- CLIENT *h;
- u_long proc;
- xdrproc_t xargs;
- caddr_t argsp;
- xdrproc_t xresults;
- caddr_t resultsp;
- struct timeval timeout;
+clntraw_call (CLIENT *h, u_long proc, xdrproc_t xargs, caddr_t argsp,
+ xdrproc_t xresults, caddr_t resultsp, struct timeval timeout)
{
struct clntraw_private_s *clp = clntraw_private;
XDR *xdrs = &clp->xdr_stream;
diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
index 534b310..9bcd912 100644
--- a/sunrpc/clnt_tcp.c
+++ b/sunrpc/clnt_tcp.c
@@ -224,14 +224,9 @@ libc_hidden_nolink_sunrpc (clnttcp_create, GLIBC_2_0)
#endif
static enum clnt_stat
-clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
- CLIENT *h;
- u_long proc;
- xdrproc_t xdr_args;
- caddr_t args_ptr;
- xdrproc_t xdr_results;
- caddr_t results_ptr;
- struct timeval timeout;
+clnttcp_call (CLIENT *h, u_long proc, xdrproc_t xdr_args, caddr_t args_ptr,
+ xdrproc_t xdr_results, caddr_t results_ptr,
+ struct timeval timeout)
{
struct ct_data *ct = (struct ct_data *) h->cl_private;
XDR *xdrs = &(ct->ct_xdrs);
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index cc1da47..5653324 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -220,12 +220,8 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
libc_hidden_nolink_sunrpc (clntudp_bufcreate, GLIBC_2_0)
CLIENT *
-clntudp_create (raddr, program, version, wait, sockp)
- struct sockaddr_in *raddr;
- u_long program;
- u_long version;
- struct timeval wait;
- int *sockp;
+clntudp_create (struct sockaddr_in *raddr, u_long program, u_long version,
+ struct timeval wait, int *sockp)
{
return __libc_clntudp_bufcreate (raddr, program, version, wait,
sockp, UDPMSGSIZE, UDPMSGSIZE, 0);
diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
index ac3465e..1b8c179 100644
--- a/sunrpc/clnt_unix.c
+++ b/sunrpc/clnt_unix.c
@@ -203,14 +203,9 @@ fooy:
libc_hidden_nolink_sunrpc (clntunix_create, GLIBC_2_1)
static enum clnt_stat
-clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
- CLIENT *h;
- u_long proc;
- xdrproc_t xdr_args;
- caddr_t args_ptr;
- xdrproc_t xdr_results;
- caddr_t results_ptr;
- struct timeval timeout;
+clntunix_call (CLIENT *h, u_long proc, xdrproc_t xdr_args, caddr_t args_ptr,
+ xdrproc_t xdr_results, caddr_t results_ptr,
+ struct timeval timeout)
{
struct ct_data *ct = (struct ct_data *) h->cl_private;
XDR *xdrs = &(ct->ct_xdrs);
diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
index d9df0cc..5045341 100644
--- a/sunrpc/pm_getport.c
+++ b/sunrpc/pm_getport.c
@@ -152,11 +152,8 @@ libc_hidden_nolink_sunrpc (__libc_rpc_getport, GLIBC_PRIVATE)
* Returns 0 if no map exists.
*/
u_short
-pmap_getport (address, program, version, protocol)
- struct sockaddr_in *address;
- u_long program;
- u_long version;
- u_int protocol;
+pmap_getport (struct sockaddr_in *address, u_long program, u_long version,
+ u_int protocol)
{
return __libc_rpc_getport (address, program, version, protocol, 5, 60);
}
diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
index 2097f92..956a1e9 100644
--- a/sunrpc/svc_udp.c
+++ b/sunrpc/svc_udp.c
@@ -585,11 +585,8 @@ cache_set (SVCXPRT *xprt, u_long replylen)
* return 1 if found, 0 if not found
*/
static int
-cache_get (xprt, msg, replyp, replylenp)
- SVCXPRT *xprt;
- struct rpc_msg *msg;
- char **replyp;
- u_long *replylenp;
+cache_get (SVCXPRT *xprt, struct rpc_msg *msg, char **replyp,
+ u_long *replylenp)
{
u_int loc;
cache_ptr ent;
diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
index a634861..fd9d1fb 100644
--- a/sunrpc/xdr_array.c
+++ b/sunrpc/xdr_array.c
@@ -141,12 +141,8 @@ libc_hidden_nolink_sunrpc (xdr_array, GLIBC_2_0)
* > xdr_elem: routine to XDR each element
*/
bool_t
-xdr_vector (xdrs, basep, nelem, elemsize, xdr_elem)
- XDR *xdrs;
- char *basep;
- u_int nelem;
- u_int elemsize;
- xdrproc_t xdr_elem;
+xdr_vector (XDR *xdrs, char *basep, u_int nelem, u_int elemsize,
+ xdrproc_t xdr_elem)
{
u_int i;
char *elptr;
diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c
index 7a44764..94531be 100644
--- a/sysdeps/mach/hurd/getcwd.c
+++ b/sysdeps/mach/hurd/getcwd.c
@@ -284,10 +284,8 @@ _hurd_canonicalize_directory_name_internal (file_t thisdir,
}
char *
-__canonicalize_directory_name_internal (thisdir, buf, size)
- const char *thisdir;
- char *buf;
- size_t size;
+__canonicalize_directory_name_internal (const char *thisdir, char *buf,
+ size_t size)
{
char *result;
file_t port = __file_name_lookup (thisdir, 0, 0);
diff --git a/sysdeps/mach/hurd/pselect.c b/sysdeps/mach/hurd/pselect.c
index 8f5fdc9..45ea5a7 100644
--- a/sysdeps/mach/hurd/pselect.c
+++ b/sysdeps/mach/hurd/pselect.c
@@ -30,13 +30,8 @@
SIGMASK for this call. Returns the number of ready descriptors, or -1 for
errors. */
int
-__pselect (nfds, readfds, writefds, exceptfds, timeout, sigmask)
- int nfds;
- fd_set *readfds;
- fd_set *writefds;
- fd_set *exceptfds;
- const struct timespec *timeout;
- const sigset_t *sigmask;
+__pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+ const struct timespec *timeout, const sigset_t *sigmask)
{
return _hurd_select (nfds, NULL,
readfds, writefds, exceptfds, timeout, sigmask);
diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c
index 0b88df0..c46a5b8 100644
--- a/sysdeps/mach/hurd/recvfrom.c
+++ b/sysdeps/mach/hurd/recvfrom.c
@@ -27,13 +27,8 @@
the sender, and store the actual size of the address in *ADDR_LEN.
Returns the number of bytes read or -1 for errors. */
ssize_t
-__recvfrom (fd, buf, n, flags, addrarg, addr_len)
- int fd;
- void *buf;
- size_t n;
- int flags;
- __SOCKADDR_ARG addrarg;
- socklen_t *addr_len;
+__recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addrarg,
+ socklen_t *addr_len)
{
error_t err;
mach_port_t addrport;
diff --git a/sysdeps/mach/hurd/select.c b/sysdeps/mach/hurd/select.c
index 47baf04..7bf07d4 100644
--- a/sysdeps/mach/hurd/select.c
+++ b/sysdeps/mach/hurd/select.c
@@ -26,12 +26,8 @@
after waiting the interval specified therein. Returns the number of ready
descriptors, or -1 for errors. */
int
-__select (nfds, readfds, writefds, exceptfds, timeout)
- int nfds;
- fd_set *readfds;
- fd_set *writefds;
- fd_set *exceptfds;
- struct timeval *timeout;
+__select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+ struct timeval *timeout)
{
struct timespec ts, *to;
diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c
index 7fa8533..5470aed 100644
--- a/sysdeps/posix/ttyname_r.c
+++ b/sysdeps/posix/ttyname_r.c
@@ -37,14 +37,8 @@ static int getttyname_r (int fd, char *buf, size_t buflen,
static int
internal_function
-getttyname_r (fd, buf, buflen, mydev, myino, save, dostat)
- int fd;
- char *buf;
- size_t buflen;
- dev_t mydev;
- ino_t myino;
- int save;
- int *dostat;
+getttyname_r (int fd, char *buf, size_t buflen, dev_t mydev, ino_t myino,
+ int save, int *dostat)
{
struct stat st;
DIR *dirstream;
diff --git a/sysdeps/pthread/timer_settime.c b/sysdeps/pthread/timer_settime.c
index b9f8586..3db3799 100644
--- a/sysdeps/pthread/timer_settime.c
+++ b/sysdeps/pthread/timer_settime.c
@@ -25,11 +25,8 @@
/* Set timer TIMERID to VALUE, returning old value in OVLAUE. */
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)
{
struct timer_node *timer;
struct thread_node *thread = NULL;
diff --git a/sysdeps/sparc/nptl/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c
index d13c32a..e630445 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_init.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_init.c
@@ -23,10 +23,8 @@
#include <sparc-nptl.h>
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)
{
union sparc_pthread_barrier *ibarrier;
diff --git a/sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c b/sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
index 6199013..d4d1be4 100644
--- a/sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
+++ b/sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
@@ -25,10 +25,8 @@
# include <internaltypes.h>
# include <shlib-compat.h>
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)
{
cond_compat_check_and_clear (cond);
return __pthread_cond_timedwait_internal (cond, mutex, abstime);
diff --git a/sysdeps/unix/sysv/linux/i386/putmsg.c b/sysdeps/unix/sysv/linux/i386/putmsg.c
index ab0112d..25648cd 100644
--- a/sysdeps/unix/sysv/linux/i386/putmsg.c
+++ b/sysdeps/unix/sysv/linux/i386/putmsg.c
@@ -24,11 +24,8 @@
#ifdef __NR_putpmsg
int
-putmsg (fildes, ctlptr, dataptr, flags)
- int fildes;
- const struct strbuf *ctlptr;
- const struct strbuf *dataptr;
- int flags;
+putmsg (int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr,
+ int flags)
{
return INLINE_SYSCALL (putpmsg, 5, fildes, ctlptr, dataptr, -1, flags);
}
diff --git a/sysdeps/unix/sysv/linux/s390/semtimedop.c b/sysdeps/unix/sysv/linux/s390/semtimedop.c
index 3863873..9aca790 100644
--- a/sysdeps/unix/sysv/linux/s390/semtimedop.c
+++ b/sysdeps/unix/sysv/linux/s390/semtimedop.c
@@ -26,11 +26,8 @@
/* Perform user-defined atomical operation of array of semaphores. */
int
-semtimedop (semid, sops, nsops, timeout)
- int semid;
- struct sembuf *sops;
- size_t nsops;
- const struct timespec *timeout;
+semtimedop (int semid, struct sembuf *sops, size_t nsops,
+ const struct timespec *timeout)
{
return INLINE_SYSCALL (ipc, 5, IPCOP_semtimedop,
semid, (int) nsops, timeout, sops);
diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c
index 02df07e..7a80b48 100644
--- a/sysdeps/unix/sysv/linux/semtimedop.c
+++ b/sysdeps/unix/sysv/linux/semtimedop.c
@@ -26,11 +26,8 @@
/* Perform user-defined atomical operation of array of semaphores. */
int
-semtimedop (semid, sops, nsops, timeout)
- int semid;
- struct sembuf *sops;
- size_t nsops;
- const struct timespec *timeout;
+semtimedop (int semid, struct sembuf *sops, size_t nsops,
+ const struct timespec *timeout)
{
return INLINE_SYSCALL (ipc, 6, IPCOP_semtimedop,
semid, (int) nsops, 0, sops,
diff --git a/sysdeps/unix/sysv/linux/timer_settime.c b/sysdeps/unix/sysv/linux/timer_settime.c
index 87c6519..431a427 100644
--- a/sysdeps/unix/sysv/linux/timer_settime.c
+++ b/sysdeps/unix/sysv/linux/timer_settime.c
@@ -29,11 +29,8 @@
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
struct timer *kt = (struct timer *) timerid;
diff --git a/sysvipc/semtimedop.c b/sysvipc/semtimedop.c
index b1769bb..8e24759 100644
--- a/sysvipc/semtimedop.c
+++ b/sysvipc/semtimedop.c
@@ -22,11 +22,8 @@
/* Perform user-defined atomical operation of array of semaphores. */
int
-semtimedop (semid, sops, nsops, timeout)
- int semid;
- struct sembuf *sops;
- size_t nsops;
- const struct timespec *timeout;
+semtimedop (int semid, struct sembuf *sops, size_t nsops,
+ const struct timespec *timeout)
{
__set_errno (ENOSYS);
return -1;
diff --git a/time/setitimer.c b/time/setitimer.c
index 6b49a60..db5fd6b 100644
--- a/time/setitimer.c
+++ b/time/setitimer.c
@@ -23,10 +23,8 @@
set *OLD to the old value of timer WHICH.
Returns 0 on success, -1 on errors. */
int
-__setitimer (which, new, old)
- enum __itimer_which which;
- const struct itimerval *new;
- struct itimerval *old;
+__setitimer (enum __itimer_which which, const struct itimerval *new,
+ struct itimerval *old)
{
if (new == NULL)
{
diff --git a/time/strftime_l.c b/time/strftime_l.c
index 26829cf..dc33a40 100644
--- a/time/strftime_l.c
+++ b/time/strftime_l.c
@@ -1438,11 +1438,8 @@ __strftime_internal (s, maxsize, format, tp, tzset_called ut_argument
strftime function and does not have the extra information whether the
TP arguments comes from a `gmtime' call or not. */
size_t
-emacs_strftime (s, maxsize, format, tp)
- char *s;
- size_t maxsize;
- const char *format;
- const struct tm *tp;
+emacs_strftime (char *s, size_t maxsize, const char *format,
+ const struct tm *tp)
{
return my_strftime (s, maxsize, format, tp, 0);
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 89 ++++++++++++++++++++
crypt/crypt-entry.c | 6 +-
crypt/crypt_util.c | 6 +-
libio/genops.c | 8 +--
libio/iofopncook.c | 12 +--
libio/iofwrite_u.c | 7 +-
libio/iogetline.c | 17 +---
libio/iogetwline.c | 17 +---
libio/vsnprintf.c | 7 +-
libio/vswprintf.c | 7 +-
locale/programs/simple-hash.c | 31 ++-----
login/forkpty.c | 7 +-
misc/hsearch_r.c | 7 +-
misc/select.c | 8 +--
nptl/cleanup_defer_compat.c | 5 +-
nptl/old_pthread_cond_init.c | 5 +-
nptl/old_pthread_cond_timedwait.c | 6 +-
nptl/pthread_barrier_init.c | 6 +-
nptl/pthread_barrierattr_getpshared.c | 5 +-
nptl/pthread_getschedparam.c | 6 +-
nptl/pthread_mutex_setprioceiling.c | 6 +-
nptl/pthread_mutexattr_getprioceiling.c | 5 +-
nptl/pthread_rwlock_init.c | 5 +-
nptl/pthread_rwlock_timedrdlock.c | 5 +-
nptl/pthread_rwlock_timedwrlock.c | 5 +-
nptl/pthread_setschedparam.c | 6 +-
socket/recvfrom.c | 9 +--
socket/sendto.c | 9 +--
socket/setsockopt.c | 8 +--
stdio-common/_itoa.c | 7 +-
stdio-common/_itowa.c | 7 +-
stdio-common/reg-printf.c | 12 +--
stdio-common/tempname.c | 8 +--
stdlib/addmul_1.c | 7 +-
stdlib/mul_1.c | 7 +-
stdlib/random_r.c | 7 +-
stdlib/setenv.c | 7 +-
stdlib/submul_1.c | 7 +-
streams/getpmsg.c | 8 +--
streams/putmsg.c | 7 +-
streams/putpmsg.c | 8 +--
sunrpc/clnt_raw.c | 10 +--
sunrpc/clnt_tcp.c | 11 +--
sunrpc/clnt_udp.c | 8 +--
sunrpc/clnt_unix.c | 11 +--
sunrpc/pm_getport.c | 7 +-
sunrpc/svc_udp.c | 7 +-
sunrpc/xdr_array.c | 8 +--
sysdeps/mach/hurd/getcwd.c | 6 +-
sysdeps/mach/hurd/pselect.c | 9 +--
sysdeps/mach/hurd/recvfrom.c | 9 +--
sysdeps/mach/hurd/select.c | 8 +--
sysdeps/posix/ttyname_r.c | 10 +--
sysdeps/pthread/timer_settime.c | 7 +-
sysdeps/sparc/nptl/pthread_barrier_init.c | 6 +-
.../unix/sysv/linux/hppa/pthread_cond_timedwait.c | 6 +-
sysdeps/unix/sysv/linux/i386/putmsg.c | 7 +-
sysdeps/unix/sysv/linux/s390/semtimedop.c | 7 +-
sysdeps/unix/sysv/linux/semtimedop.c | 7 +-
sysdeps/unix/sysv/linux/timer_settime.c | 7 +-
sysvipc/semtimedop.c | 7 +-
time/setitimer.c | 6 +-
time/strftime_l.c | 7 +-
63 files changed, 229 insertions(+), 354 deletions(-)
hooks/post-receive
--
GNU C Library master sources