lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Convert 29 more function definitions to prototype style (multiple parameters in one K&R parameter declaration).

Browse Source 
This automatically-generated patch converts 29 function definitions in
glibc (including one in an example in the manual) from old-style K&R
to prototype-style.  Following my other recent such patches, this one
deals with the case of function definitions where one K&R parameter
declaration declares multiple parameters, as in:

void
foo (a, b)
     int a, *b;
{
}

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

	* crypt/crypt.c (_ufc_doit_r): Convert to prototype-style function
	definition.
	(_ufc_doit_r): Likewise.
	* crypt/crypt_util.c (_ufc_copymem): Likewise.
	(_ufc_output_conversion_r): Likewise.
	* inet/inet_mkadr.c (__inet_makeaddr): Likewise.
	* inet/rcmd.c (rcmd_af): Likewise.
	(rcmd): Likewise.
	(ruserok_af): Likewise.
	(ruserok): Likewise.
	(ruserok2_sa): Likewise.
	(ruserok_sa): Likewise.
	(iruserok_af): Likewise.
	(iruserok): Likewise.
	(__ivaliduser): Likewise.
	(__validuser2_sa): Likewise.
	* inet/rexec.c (rexec_af): Likewise.
	(rexec): Likewise.
	* inet/ruserpass.c (ruserpass): Likewise.
	* locale/programs/xmalloc.c (xcalloc): Likewise.
	* manual/examples/timeval_subtract.c (timeval_subtract): Likewise.
	* math/w_drem.c (__drem): Likewise.
	* math/w_dremf.c (__dremf): Likewise.
	* math/w_dreml.c (__dreml): Likewise.
	* misc/daemon.c (daemon): Likewise.
	* resolv/res_debug.c (p_fqnname): Likewise.
	* stdlib/div.c (div): Likewise.
	* string/memcmp.c (memcmp_bytes): Likewise.
	* sunrpc/pmap_rmt.c (pmap_rmtcall): Likewise.
	* sunrpc/svc_udp.c (svcudp_bufcreate): Likewise.
This commit is contained in:
Joseph Myers
2015-10-20 11:52:27 +00:00
parent a72ddc1424
commit 41075ae3e7
18 changed files with 78 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
inet/rcmd.c
View File

@ -103,12 +103,8 @@ libc_hidden_proto (iruserok_af)
libc_freeres_ptr(static char *ahostbuf);
int
rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
char **ahost;
u_short rport;
const char *locuser, *remuser, *cmd;
int *fd2p;
sa_family_t af;
rcmd_af (char **ahost, u_short rport, const char *locuser, const char *remuser,
const char *cmd, int *fd2p, sa_family_t af)
{
char paddr[INET6_ADDRSTRLEN];
struct addrinfo hints, *res, *ai;
@ -360,11 +356,8 @@ bad:
libc_hidden_def (rcmd_af)
int
rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
char **ahost;
u_short rport;
const char *locuser, *remuser, *cmd;
int *fd2p;
rcmd (char **ahost, u_short rport, const char *locuser, const char *remuser,
const char *cmd, int *fd2p)
{
return rcmd_af (ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
}
@ -438,10 +431,8 @@ int __check_rhosts_file = 1;
char *__rcmd_errstr;
int
ruserok_af(rhost, superuser, ruser, luser, af)
const char *rhost, *ruser, *luser;
int superuser;
sa_family_t af;
ruserok_af (const char *rhost, int superuser, const char *ruser,
const char *luser, sa_family_t af)
{
struct addrinfo hints, *res, *res0;
int gai;
@ -465,9 +456,8 @@ ruserok_af(rhost, superuser, ruser, luser, af)
libc_hidden_def (ruserok_af)
int
ruserok(rhost, superuser, ruser, luser)
const char *rhost, *ruser, *luser;
int superuser;
ruserok (const char *rhost, int superuser, const char *ruser,
const char *luser)
{
return ruserok_af(rhost, superuser, ruser, luser, AF_INET);
}
@ -527,11 +517,8 @@ iruserfopen (const char *file, uid_t okuser)
* Returns 0 if ok, -1 if not ok.
*/
static int
ruserok2_sa (ra, ralen, superuser, ruser, luser, rhost)
struct sockaddr *ra;
size_t ralen;
int superuser;
const char *ruser, *luser, *rhost;
ruserok2_sa (struct sockaddr *ra, size_t ralen, int superuser,
const char *ruser, const char *luser, const char *rhost)
{
FILE *hostf = NULL;
int isbad = -1;
@ -588,22 +575,17 @@ ruserok2_sa (ra, ralen, superuser, ruser, luser, rhost)
* ruserok_sa() is now discussed on ipng, so
* currently disabled for external use
*/
static int ruserok_sa(ra, ralen, superuser, ruser, luser)
struct sockaddr *ra;
size_t ralen;
int superuser;
const char *ruser, *luser;
static int
ruserok_sa (struct sockaddr *ra, size_t ralen, int superuser,
const char *ruser, const char *luser)
{
return ruserok2_sa(ra, ralen, superuser, ruser, luser, "-");
}
/* This is the exported version. */
int
iruserok_af (raddr, superuser, ruser, luser, af)
const void *raddr;
int superuser;
const char *ruser, *luser;
sa_family_t af;
iruserok_af (const void *raddr, int superuser, const char *ruser,
const char *luser, sa_family_t af)
{
union {
struct sockaddr generic;
@ -632,10 +614,7 @@ iruserok_af (raddr, superuser, ruser, luser, af)
libc_hidden_def (iruserok_af)
int
iruserok (raddr, superuser, ruser, luser)
u_int32_t raddr;
int superuser;
const char *ruser, *luser;
iruserok (u_int32_t raddr, int superuser, const char *ruser, const char *luser)
{
return iruserok_af (&raddr, superuser, ruser, luser, AF_INET);
}
@ -652,10 +631,8 @@ iruserok (raddr, superuser, ruser, luser)
* Returns 0 if ok, -1 if not ok.
*/
int
__ivaliduser(hostf, raddr, luser, ruser)
FILE *hostf;
u_int32_t raddr;
const char *luser, *ruser;
__ivaliduser (FILE *hostf, u_int32_t raddr, const char *luser,
const char *ruser)
{
struct sockaddr_in ra;
memset(&ra, '\0', sizeof(ra));
@ -766,11 +743,8 @@ __isempty (char *p)
* Returns 0 if positive match, -1 if _not_ ok.
*/
static int
__validuser2_sa(hostf, ra, ralen, luser, ruser, rhost)
FILE *hostf;
struct sockaddr *ra;
size_t ralen;
const char *luser, *ruser, *rhost;
__validuser2_sa (FILE *hostf, struct sockaddr *ra, size_t ralen,
const char *luser, const char *ruser, const char *rhost)
{
const char *user;
char *p;