Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

1 files changed, 16 insertions, 16 deletions

diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 5b36626ceb0..72183d260ba 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getaddrinfo.c,v 1.31 2002/01/02 23:00:10 deraadt Exp $	*/
+/*	$OpenBSD: getaddrinfo.c,v 1.32 2002/02/16 21:27:23 millert Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $	*/
 
 /*
@@ -199,7 +199,7 @@ struct res_target {
 	int n;			/* result length */
 };
 
-static int str_isnumber __P((const char *));
+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 *,
@@ -212,32 +212,32 @@ 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 get_portmatch __P((const struct addrinfo *, const char *));
-static int get_port __P((struct addrinfo *, const char *, int));
-static const struct afd *find_afd __P((int));
+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);
 #if 0
-static int addrconfig __P((const struct addrinfo *));
+static int addrconfig(const struct addrinfo *);
 #endif
 #ifdef INET6
-static int ip6_str2scopeid __P((char *, struct sockaddr_in6 *));
+static int ip6_str2scopeid(char *, struct sockaddr_in6 *);
 #endif
 
-static void _sethtent __P((void));
-static void _endhtent __P((void));
-static struct addrinfo * _gethtent __P((const char *, const struct addrinfo *));
+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 *));
 
 #ifdef YP
-static struct addrinfo *_yphostent __P((char *, const struct addrinfo *));
+static struct addrinfo *_yphostent(char *, const struct addrinfo *);
 static struct addrinfo *_yp_getaddrinfo __P((const char *,
 	const struct addrinfo *));
 #endif
 
 static struct addrinfo *getanswer __P((const querybuf *, int, const char *, int,
 	const struct addrinfo *));
-static int res_queryN __P((const char *, struct res_target *));
-static int res_searchN __P((const char *, struct res_target *));
+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 *,
@@ -1037,7 +1037,7 @@ getanswer(answer, anslen, qname, qtype, pai)
 	int type, class, buflen, ancount, qdcount;
 	int haveanswer, had_error;
 	char tbuf[MAXDNAME];
-	int (*name_ok) __P((const char *));
+	int (*name_ok)(const char *);
 	char hostbuf[8*1024];
 
 	memset(&sentinel, 0, sizeof(sentinel));
@@ -1509,9 +1509,9 @@ _yp_getaddrinfo(name, pai)
 
 /* resolver logic */
 
-extern const char *__hostalias __P((const char *));
+extern const char *__hostalias(const char *);
 extern int h_errno;
-extern int res_opt __P((int, u_char *, int, int));
+extern int res_opt(int, u_char *, int, int);
 
 /*
  * Formulate a normal query, send, and await answer.