From 4d9f43fe58441f274978bd37f319b3c63bd308d3 Mon Sep 17 00:00:00 2001 From: millert <> Date: Sun, 17 Feb 2002 19:42:31 +0000 Subject: Manual cleanup of remaining userland __P use (excluding packages maintained outside the tree) --- src/lib/libc/net/getaddrinfo.c | 44 +++++++++++++++++++--------------------- src/lib/libc/net/gethostnamadr.c | 5 ++--- src/lib/libc/net/getnameinfo.c | 6 +++--- src/lib/libc/net/inet_net_ntop.c | 7 +++---- src/lib/libc/net/inet_net_pton.c | 7 +++---- src/lib/libc/net/rcmd.c | 6 +++--- src/lib/libc/net/res_comp.c | 7 +++---- src/lib/libc/stdlib/merge.c | 6 +++--- src/lib/libc/stdlib/qsort.c | 4 ++-- src/lib/libc/stdlib/radixsort.c | 6 +++--- src/usr.bin/nc/netcat.c | 4 ++-- 11 files changed, 48 insertions(+), 54 deletions(-) diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c index 72183d260b..d16900b4a0 100644 --- a/src/lib/libc/net/getaddrinfo.c +++ b/src/lib/libc/net/getaddrinfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getaddrinfo.c,v 1.32 2002/02/16 21:27:23 millert Exp $ */ +/* $OpenBSD: getaddrinfo.c,v 1.33 2002/02/17 19:42:23 millert Exp $ */ /* $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $ */ /* @@ -200,18 +200,18 @@ struct res_target { }; static int str_isnumber(const char *); -static int explore_fqdn __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int explore_null __P((const struct addrinfo *, - const char *, struct addrinfo **)); -static int explore_numeric __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int explore_numeric_scope __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int get_canonname __P((const struct addrinfo *, - struct addrinfo *, const char *)); -static struct addrinfo *get_ai __P((const struct addrinfo *, - const struct afd *, const char *)); +static int explore_fqdn(const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int explore_null(const struct addrinfo *, + const char *, struct addrinfo **); +static int explore_numeric(const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int explore_numeric_scope(const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int get_canonname(const struct addrinfo *, + struct addrinfo *, const char *); +static struct addrinfo *get_ai(const struct addrinfo *, + const struct afd *, const char *); static int get_portmatch(const struct addrinfo *, const char *); static int get_port(struct addrinfo *, const char *, int); static const struct afd *find_afd(int); @@ -225,23 +225,21 @@ static int ip6_str2scopeid(char *, struct sockaddr_in6 *); static void _sethtent(void); static void _endhtent(void); static struct addrinfo * _gethtent(const char *, const struct addrinfo *); -static struct addrinfo *_files_getaddrinfo __P((const char *, - const struct addrinfo *)); +static struct addrinfo *_files_getaddrinfo(const char *, + const struct addrinfo *); #ifdef YP static struct addrinfo *_yphostent(char *, const struct addrinfo *); -static struct addrinfo *_yp_getaddrinfo __P((const char *, - const struct addrinfo *)); +static struct addrinfo *_yp_getaddrinfo(const char *, + const struct addrinfo *); #endif -static struct addrinfo *getanswer __P((const querybuf *, int, const char *, int, - const struct addrinfo *)); +static struct addrinfo *getanswer(const querybuf *, int, const char *, int, + const struct addrinfo *); static int res_queryN(const char *, struct res_target *); static int res_searchN(const char *, struct res_target *); -static int res_querydomainN __P((const char *, const char *, - struct res_target *)); -static struct addrinfo *_dns_getaddrinfo __P((const char *, - const struct addrinfo *)); +static int res_querydomainN(const char *, const char *, struct res_target *); +static struct addrinfo *_dns_getaddrinfo(const char *, const struct addrinfo *); /* XXX macros that make external reference is BAD. */ diff --git a/src/lib/libc/net/gethostnamadr.c b/src/lib/libc/net/gethostnamadr.c index d4e3c5e6f0..9061caf0c2 100644 --- a/src/lib/libc/net/gethostnamadr.c +++ b/src/lib/libc/net/gethostnamadr.c @@ -52,7 +52,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.44 2002/02/16 21:27:23 millert Exp $"; +static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.45 2002/02/17 19:42:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -126,8 +126,7 @@ typedef union { char ac; } align; -static struct hostent *getanswer __P((const querybuf *, int, const char *, - int)); +static struct hostent *getanswer(const querybuf *, int, const char *, int); extern int h_errno; diff --git a/src/lib/libc/net/getnameinfo.c b/src/lib/libc/net/getnameinfo.c index c19603f2d1..15dc9dcdea 100644 --- a/src/lib/libc/net/getnameinfo.c +++ b/src/lib/libc/net/getnameinfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnameinfo.c,v 1.22 2002/02/16 21:27:23 millert Exp $ */ +/* $OpenBSD: getnameinfo.c,v 1.23 2002/02/17 19:42:23 millert Exp $ */ /* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */ /* @@ -81,8 +81,8 @@ struct sockinet { }; #ifdef INET6 -static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *, - size_t, int)); +static int ip6_parsenumeric(const struct sockaddr *, const char *, char *, + size_t, int); static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int); #endif diff --git a/src/lib/libc/net/inet_net_ntop.c b/src/lib/libc/net/inet_net_ntop.c index 943ec44550..f5cb588d10 100644 --- a/src/lib/libc/net/inet_net_ntop.c +++ b/src/lib/libc/net/inet_net_ntop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 downsj Exp $ */ +/* $OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:23 millert Exp $ */ /* * Copyright (c) 1996 by Internet Software Consortium. @@ -21,7 +21,7 @@ #if 0 static const char rcsid[] = "$From: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp $"; #else -static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 downsj Exp $"; +static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:23 millert Exp $"; #endif #endif @@ -35,8 +35,7 @@ static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 #include #include -static char * inet_net_ntop_ipv4 __P((const u_char *src, int bits, - char *dst, size_t size)); +static char *inet_net_ntop_ipv4(const u_char *, int, char *, size_t); /* * char * diff --git a/src/lib/libc/net/inet_net_pton.c b/src/lib/libc/net/inet_net_pton.c index b529e83664..932531eb5d 100644 --- a/src/lib/libc/net/inet_net_pton.c +++ b/src/lib/libc/net/inet_net_pton.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 downsj Exp $ */ +/* $OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:23 millert Exp $ */ /* * Copyright (c) 1996 by Internet Software Consortium. @@ -21,7 +21,7 @@ #if 0 static const char rcsid[] = "$From: inet_net_pton.c,v 8.3 1996/11/11 06:36:52 vixie Exp $"; #else -static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 downsj Exp $"; +static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:23 millert Exp $"; #endif #endif @@ -37,8 +37,7 @@ static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 #include #include -static int inet_net_pton_ipv4 __P((const char *src, u_char *dst, - size_t size)); +static int inet_net_pton_ipv4(const char *, u_char *, size_t); /* * static int diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c index 95d481a7f6..143b667ba8 100644 --- a/src/lib/libc/net/rcmd.c +++ b/src/lib/libc/net/rcmd.c @@ -34,7 +34,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: rcmd.c,v 1.40 2002/02/16 21:27:23 millert Exp $"; +static char *rcsid = "$OpenBSD: rcmd.c,v 1.41 2002/02/17 19:42:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -58,8 +58,8 @@ static char *rcsid = "$OpenBSD: rcmd.c,v 1.40 2002/02/16 21:27:23 millert Exp $" #include int __ivaliduser(FILE *, in_addr_t, const char *, const char *); -int __ivaliduser_sa __P((FILE *, struct sockaddr *, socklen_t, - const char *, const char *)); +int __ivaliduser_sa(FILE *, struct sockaddr *, socklen_t, + const char *, const char *); static int __icheckhost(struct sockaddr *, socklen_t, const char *); static char *__gethostloop(struct sockaddr *, socklen_t); diff --git a/src/lib/libc/net/res_comp.c b/src/lib/libc/net/res_comp.c index f7a0358967..948923cf37 100644 --- a/src/lib/libc/net/res_comp.c +++ b/src/lib/libc/net/res_comp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $ */ +/* $OpenBSD: res_comp.c,v 1.9 2002/02/17 19:42:23 millert Exp $ */ /* * ++Copyright++ 1985, 1993 @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "$From: res_comp.c,v 8.11 1996/12/02 09:17:22 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $"; +static char rcsid[] = "$OpenBSD: res_comp.c,v 1.9 2002/02/17 19:42:23 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -76,8 +76,7 @@ static char rcsid[] = "$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Ex #include #include -static int dn_find __P((u_char *exp_dn, u_char *msg, - u_char **dnptrs, u_char **lastdnptr)); +static int dn_find(u_char *, u_char *, u_char **, u_char **); /* * Expand compressed domain name 'comp_dn' to full domain name. diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c index 345eb2fd8b..4ae6488af2 100644 --- a/src/lib/libc/stdlib/merge.c +++ b/src/lib/libc/stdlib/merge.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; +static char *rcsid = "$OpenBSD: merge.c,v 1.5 2002/02/17 19:42:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -58,8 +58,8 @@ static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $" #include #include -static void setup __P((u_char *, u_char *, size_t, size_t, int (*)())); -static void insertionsort __P((u_char *, size_t, size_t, int (*)())); +static void setup(u_char *, u_char *, size_t, size_t, int (*)()); +static void insertionsort(u_char *, size_t, size_t, int (*)()); #define ISIZE sizeof(int) #define PSIZE sizeof(u_char *) diff --git a/src/lib/libc/stdlib/qsort.c b/src/lib/libc/stdlib/qsort.c index d16ed7b0bd..9b8bb5801b 100644 --- a/src/lib/libc/stdlib/qsort.c +++ b/src/lib/libc/stdlib/qsort.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: qsort.c,v 1.6 2002/02/16 21:27:24 millert Exp $"; +static char *rcsid = "$OpenBSD: qsort.c,v 1.7 2002/02/17 19:42:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include #include -static __inline char *med3 __P((char *, char *, char *, int (*)())); +static __inline char *med3(char *, char *, char *, int (*)()); static __inline void swapfunc(char *, char *, int, int); #define min(a, b) (a) < (b) ? a : b diff --git a/src/lib/libc/stdlib/radixsort.c b/src/lib/libc/stdlib/radixsort.c index 40d7c0789f..e03b479715 100644 --- a/src/lib/libc/stdlib/radixsort.c +++ b/src/lib/libc/stdlib/radixsort.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: radixsort.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; +static char *rcsid = "$OpenBSD: radixsort.c,v 1.5 2002/02/17 19:42:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -63,8 +63,8 @@ typedef struct { static __inline void simplesort (const u_char **, int, int, const u_char *, u_int); static void r_sort_a(const u_char **, int, int, const u_char *, u_int); -static void r_sort_b __P((const u_char **, - const u_char **, int, int, const u_char *, u_int)); +static void r_sort_b(const u_char **, + const u_char **, int, int, const u_char *, u_int); #define THRESHOLD 20 /* Divert to simplesort(). */ #define SIZE 512 /* Default stack size. */ diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index 8caa2483e3..8d5603c999 100644 --- a/src/usr.bin/nc/netcat.c +++ b/src/usr.bin/nc/netcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.43 2002/02/17 03:24:56 ericj Exp $ */ +/* $OpenBSD: netcat.c,v 1.44 2002/02/17 19:42:31 millert Exp $ */ /* * Copyright (c) 2001 Eric Jackson * @@ -70,7 +70,7 @@ int timeout; int family = AF_UNSPEC; char *portlist[PORT_MAX]; -ssize_t atomicio __P((ssize_t (*)(), int, void *, size_t)); +ssize_t atomicio(ssize_t (*)(), int, void *, size_t); void atelnet(int, unsigned char *, unsigned int); void build_ports(char *); void help(void); -- cgit v1.2.3-55-g6feb