mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert 24 more function definitions to prototype style (array parameters).

Browse Source 
This automatically-generated patch converts 24 function definitions in
glibc from old-style K&R to prototype-style.  Following my other
recent such patches, this one deals with the case of functions with
array parameters.

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).

	* crypt/cert.c (main): Convert to prototype-style function
	definition.
	* io/pipe.c (__pipe): Likewise.
	* io/pipe2.c (__pipe2): Likewise.
	* misc/futimesat.c (futimesat): Likewise.
	* misc/utimes.c (__utimes): Likewise.
	* posix/execve.c (__execve): Likewise.
	* posix/execvp.c (execvp): Likewise.
	* posix/execvpe.c (__execvpe): Likewise.
	* posix/fexecve.c (fexecve): Likewise.
	* socket/socketpair.c (socketpair): Likewise.
	* stdlib/drand48-iter.c (__drand48_iterate): Likewise.
	* stdlib/erand48.c (erand48): Likewise.
	* stdlib/erand48_r.c (__erand48_r): Likewise.
	* stdlib/jrand48.c (jrand48): Likewise.
	* stdlib/jrand48_r.c (__jrand48_r): Likewise.
	* stdlib/lcong48.c (lcong48): Likewise.
	* stdlib/lcong48_r.c (__lcong48_r): Likewise.
	* stdlib/nrand48.c (nrand48): Likewise.
	* stdlib/nrand48_r.c (__nrand48_r): Likewise.
	* stdlib/seed48.c (seed48): Likewise.
	* stdlib/seed48_r.c (__seed48_r): Likewise.
	* sysdeps/mach/hurd/execve.c (__execve): Likewise.
	* sysdeps/mach/hurd/utimes.c (__utimes): Likewise.
	* sysdeps/unix/sysv/linux/fexecve.c (fexecve): Likewise.
This commit is contained in:
Joseph Myers 2015-10-20 11:51:03 +00:00
parent 864198ed30
commit a72ddc1424
25 changed files with 55 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
2015-10-20 Joseph Myers <joseph@codesourcery.com>
* crypt/cert.c (main): Convert to prototype-style function
definition.
* io/pipe.c (__pipe): Likewise.
* io/pipe2.c (__pipe2): Likewise.
* misc/futimesat.c (futimesat): Likewise.
* misc/utimes.c (__utimes): Likewise.
* posix/execve.c (__execve): Likewise.
* posix/execvp.c (execvp): Likewise.
* posix/execvpe.c (__execvpe): Likewise.
* posix/fexecve.c (fexecve): Likewise.
* socket/socketpair.c (socketpair): Likewise.
* stdlib/drand48-iter.c (__drand48_iterate): Likewise.
* stdlib/erand48.c (erand48): Likewise.
* stdlib/erand48_r.c (__erand48_r): Likewise.
* stdlib/jrand48.c (jrand48): Likewise.
* stdlib/jrand48_r.c (__jrand48_r): Likewise.
* stdlib/lcong48.c (lcong48): Likewise.
* stdlib/lcong48_r.c (__lcong48_r): Likewise.
* stdlib/nrand48.c (nrand48): Likewise.
* stdlib/nrand48_r.c (__nrand48_r): Likewise.
* stdlib/seed48.c (seed48): Likewise.
* stdlib/seed48_r.c (__seed48_r): Likewise.
* sysdeps/mach/hurd/execve.c (__execve): Likewise.
* sysdeps/mach/hurd/utimes.c (__utimes): Likewise.
* sysdeps/unix/sysv/linux/fexecve.c (fexecve): Likewise.
2015-10-19 Joseph Myers <joseph@codesourcery.com>
* configure.ac (libc_cv_asm_unique_object): Remove configure test.

4
crypt/cert.c
View File

@ -30,9 +30,7 @@ good_bye (void)
}
int
main(argc, argv)
int argc;
char *argv[];
main (int argc, char *argv[])
{
char key[64],plain[64],cipher[64],answer[64];
int i;

3
io/pipe.c
View File

@ -24,8 +24,7 @@
bytes written on PIPEDES[1] can be read from PIPEDES[0].
Returns 0 if successful, -1 if not. */
int
__pipe (__pipedes)
int __pipedes[2];
__pipe (int __pipedes[2])
{
if (__pipedes == NULL)
{

4
io/pipe2.c
View File

@ -24,9 +24,7 @@
PIPEDES[1] can be read from PIPEDES[0]. Apply FLAGS to the new
file descriptors. Returns 0 if successful, -1 if not. */
int
__pipe2 (pipedes, flags)
int pipedes[2];
int flags;
__pipe2 (int pipedes[2], int flags)
{
if (pipedes == NULL)
{

5
misc/futimesat.c
View File

@ -24,10 +24,7 @@
/* Change the access time of FILE relative to FD to TVP[0] and
the modification time of FILE to TVP[1]. */
int
futimesat (fd, file, tvp)
int fd;
const char *file;
const struct timeval tvp[2];
futimesat (int fd, const char *file, const struct timeval tvp[2])
{
if (fd < 0
&& (file == NULL

4
misc/utimes.c
View File

@ -22,9 +22,7 @@
/* Change the access time of FILE to TVP[0] and
the modification time of FILE to TVP[1]. */
int
__utimes (file, tvp)
const char *file;
const struct timeval tvp[2];
__utimes (const char *file, const struct timeval tvp[2])
{
if (file == NULL)
{

5
posix/execve.c
View File

@ -23,10 +23,7 @@
/* Replace the current process, executing PATH with arguments ARGV and
environment ENVP. ARGV and ENVP are terminated by NULL pointers. */
int
__execve (path, argv, envp)
const char *path;
char *const argv[];
char *const envp[];
__execve (const char *path, char *const argv[], char *const envp[])
{
if (path == NULL || argv == NULL || envp == NULL)
{

4
posix/execvp.c
View File

@ -21,9 +21,7 @@
/* Execute FILE, searching in the `PATH' environment variable if it contains
no slashes, with arguments ARGV and environment from `environ'. */
int
execvp (file, argv)
const char *file;
char *const argv[];
execvp (const char *file, char *const argv[])
{
return __execvpe (file, argv, __environ);
}

5
posix/execvpe.c
View File

@ -45,10 +45,7 @@ scripts_argv (const char *file, char *const argv[], int argc, char **new_argv)
/* Execute FILE, searching in the `PATH' environment variable if it contains
no slashes, with arguments ARGV and environment from ENVP. */
int
__execvpe (file, argv, envp)
const char *file;
char *const argv[];
char *const envp[];
__execvpe (const char *file, char *const argv[], char *const envp[])
{
if (*file == '\0')
{

5
posix/fexecve.c
View File

@ -23,10 +23,7 @@
/* Execute the file FD refers to, overlaying the running program image.
ARGV and ENVP are passed to the new program, as for `execve'. */
int
fexecve (fd, argv, envp)
int fd;
char *const argv[];
char *const envp[];
fexecve (int fd, char *const argv[], char *const envp[])
{
if (fd < 0 || argv == NULL || envp == NULL)
{

6
socket/socketpair.c
View File

@ -23,11 +23,7 @@
descriptors for them in FDS[0] and FDS[1]. If PROTOCOL is zero,
one will be chosen automatically. Returns 0 on success, -1 for errors. */
int
socketpair (domain, type, protocol, fds)
int domain;
int type;
int protocol;
int fds[2];
socketpair (int domain, int type, int protocol, int fds[2])
{
__set_errno (ENOSYS);
return -1;

4
stdlib/drand48-iter.c
View File

@ -27,9 +27,7 @@ struct drand48_data __libc_drand48_data;
int
__drand48_iterate (xsubi, buffer)
unsigned short int xsubi[3];
struct drand48_data *buffer;
__drand48_iterate (unsigned short int xsubi[3], struct drand48_data *buffer)
{
uint64_t X;
uint64_t result;

3
stdlib/erand48.c
View File

@ -20,8 +20,7 @@
double
erand48 (xsubi)
unsigned short int xsubi[3];
erand48 (unsigned short int xsubi[3])
{
double result;

6
stdlib/erand48_r.c
View File

@ -22,10 +22,8 @@
int
__erand48_r (xsubi, buffer, result)
unsigned short int xsubi[3];
struct drand48_data *buffer;
double *result;
__erand48_r (unsigned short int xsubi[3], struct drand48_data *buffer,
double *result)
{
union ieee754_double temp;

3
stdlib/jrand48.c
View File

@ -20,8 +20,7 @@
long int
jrand48 (xsubi)
unsigned short int xsubi[3];
jrand48 (unsigned short int xsubi[3])
{
long int result;

6
stdlib/jrand48_r.c
View File

@ -19,10 +19,8 @@
#include <stdlib.h>
int
__jrand48_r (xsubi, buffer, result)
unsigned short int xsubi[3];
struct drand48_data *buffer;
long int *result;
__jrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer,
long int *result)
{
/* Compute next state. */
if (__drand48_iterate (xsubi, buffer) < 0)

3
stdlib/lcong48.c
View File

@ -20,8 +20,7 @@
void
lcong48 (param)
unsigned short int param[7];
lcong48 (unsigned short int param[7])
{
(void) __lcong48_r (param, &__libc_drand48_data);
}

4
stdlib/lcong48_r.c
View File

@ -22,9 +22,7 @@
#include <limits.h>
int
__lcong48_r (param, buffer)
unsigned short int param[7];
struct drand48_data *buffer;
__lcong48_r (unsigned short int param[7], struct drand48_data *buffer)
{
/* Store the given values. */
memcpy (buffer->__x, &param[0], sizeof (buffer->__x));

3
stdlib/nrand48.c
View File

@ -20,8 +20,7 @@
long int
nrand48 (xsubi)
unsigned short int xsubi[3];
nrand48 (unsigned short int xsubi[3])
{
long int result;

6
stdlib/nrand48_r.c
View File

@ -19,10 +19,8 @@
#include <stdlib.h>
int
__nrand48_r (xsubi, buffer, result)
unsigned short int xsubi[3];
struct drand48_data *buffer;
long int *result;
__nrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer,
long int *result)
{
/* Compute next state. */
if (__drand48_iterate (xsubi, buffer) < 0)

3
stdlib/seed48.c
View File

@ -20,8 +20,7 @@
unsigned short int *
seed48 (seed16v)
unsigned short int seed16v[3];
seed48 (unsigned short int seed16v[3])
{
(void) __seed48_r (seed16v, &__libc_drand48_data);

4
stdlib/seed48_r.c
View File

@ -21,9 +21,7 @@
#include <limits.h>
int
__seed48_r (seed16v, buffer)
unsigned short int seed16v[3];
struct drand48_data *buffer;
__seed48_r (unsigned short int seed16v[3], struct drand48_data *buffer)
{
/* Save old value at a private place to be used as return value. */
memcpy (buffer->__old_x, buffer->__x, sizeof (buffer->__x));

5
sysdeps/mach/hurd/execve.c
View File

@ -22,10 +22,7 @@
/* Replace the current process, executing FILE_NAME with arguments ARGV and
environment ENVP. ARGV and ENVP are terminated by NULL pointers. */
int
__execve (file_name, argv, envp)
const char *file_name;
char *const argv[];
char *const envp[];
__execve (const char *file_name, char *const argv[], char *const envp[])
{
error_t err;
file_t file = __file_name_lookup (file_name, O_EXEC, 0);

4
sysdeps/mach/hurd/utimes.c
View File

@ -23,9 +23,7 @@
/* Change the access time of FILE to TVP[0] and
the modification time of FILE to TVP[1]. */
int
__utimes (file, tvp)
const char *file;
const struct timeval tvp[2];
__utimes (const char *file, const struct timeval tvp[2])
{
union tv
{

5
sysdeps/unix/sysv/linux/fexecve.c
View File

@ -25,10 +25,7 @@
/* Execute the file FD refers to, overlaying the running program image.
ARGV and ENVP are passed to the new program, as for `execve'. */
int
fexecve (fd, argv, envp)
int fd;
char *const argv[];
char *const envp[];
fexecve (int fd, char *const argv[], char *const envp[])
{
if (fd < 0 || argv == NULL || envp == NULL)
{