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.

5 files changed, 41 insertions, 41 deletions

diff --git a/usr.sbin/pppoe/client.c b/usr.sbin/pppoe/client.c
index 30167f802f1..0d022c82eac 100644
--- a/usr.sbin/pppoe/client.c
+++ b/usr.sbin/pppoe/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.12 2001/11/17 19:54:57 deraadt Exp $	*/
+/*	$OpenBSD: client.c,v 1.13 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -68,7 +68,7 @@ int pppfd, client_state;
 
 static int getpackets __P((int, char *, char *, struct ether_addr *,
     struct ether_addr *));
-static int send_padi __P((int, struct ether_addr *, u_int8_t *));
+static int send_padi(int, struct ether_addr *, u_int8_t *);
 static int send_padr __P((int, char *, struct ether_addr *,
     struct ether_addr *, struct ether_header *, struct pppoe_header *,
     struct tag_list *));
@@ -81,10 +81,10 @@ static int recv_pads __P((int, char *, char *, struct ether_addr *,
 static int recv_padt __P((int, struct ether_addr *, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
 
-void timer_handler __P((int));
-int timer_set __P((u_int));
-int timer_clr __P((void));
-int timer_hit __P((void));
+void timer_handler(int);
+int timer_set(u_int);
+int timer_clr(void);
+int timer_hit(void);
 
 int
 client_mode(bfd, sysname, srvname, myea)
diff --git a/usr.sbin/pppoe/common.c b/usr.sbin/pppoe/common.c
index 0de402e942f..195e942cd42 100644
--- a/usr.sbin/pppoe/common.c
+++ b/usr.sbin/pppoe/common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.5 2001/07/09 07:05:04 deraadt Exp $	*/
+/*	$OpenBSD: common.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -61,7 +61,7 @@
 
 #define PPP_PROG	"/usr/sbin/ppp"
 
-void debugv __P((char *, struct iovec *, int));
+void debugv(char *, struct iovec *, int);
 
 int
 runppp(bpffd, sysname)
diff --git a/usr.sbin/pppoe/pppoe.c b/usr.sbin/pppoe/pppoe.c
index 6c6597bf98e..cc3451bb458 100644
--- a/usr.sbin/pppoe/pppoe.c
+++ b/usr.sbin/pppoe/pppoe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppoe.c,v 1.6 2002/01/10 18:21:38 jason Exp $	*/
+/*	$OpenBSD: pppoe.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -59,12 +59,12 @@
 int option_verbose = 0;
 u_char etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
-int main __P((int, char **));
-void usage __P((void));
-int getifhwaddr __P((char *, char *, struct ether_addr *));
-int setupfilter __P((char *, struct ether_addr *, int));
-void child_handler __P((int));
-int signal_init __P((void));
+int main(int, char **);
+void usage(void);
+int getifhwaddr(char *, char *, struct ether_addr *);
+int setupfilter(char *, struct ether_addr *, int);
+void child_handler(int);
+int signal_init(void);
 
 int
 main(int argc, char **argv) {
diff --git a/usr.sbin/pppoe/pppoe.h b/usr.sbin/pppoe/pppoe.h
index 7d5f5397eb6..238a9e236a8 100644
--- a/usr.sbin/pppoe/pppoe.h
+++ b/usr.sbin/pppoe/pppoe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppoe.h,v 1.2 2001/04/24 05:02:34 jason Exp $	*/
+/*	$OpenBSD: pppoe.h,v 1.3 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -89,8 +89,8 @@ struct pppoe_tag {
 extern int option_verbose;
 extern u_char etherbroadcastaddr[];
 
-void server_mode __P((int, char *, char *, struct ether_addr *));
-int client_mode __P((int, char *, char *, struct ether_addr *));
+void server_mode(int, char *, char *, struct ether_addr *);
+int client_mode(int, char *, char *, struct ether_addr *);
 
 struct tag_list {
 	LIST_HEAD(, tag_node)		thelist;
@@ -104,14 +104,14 @@ struct tag_node {
 	int		_ref;
 };
 
-void tag_init __P((struct tag_list *));
-void tag_show __P((struct tag_list *));
-void tag_destroy __P((struct tag_list *));
-struct tag_node *tag_lookup __P((struct tag_list *, u_int16_t, int));
-int tag_add __P((struct tag_list *, u_int16_t, u_int16_t, u_int8_t *));
-int tag_pkt __P((struct tag_list *, u_long, u_int8_t *));
-void tag_hton __P((struct tag_list *));
-void tag_ntoh __P((struct tag_list *));
+void tag_init(struct tag_list *);
+void tag_show(struct tag_list *);
+void tag_destroy(struct tag_list *);
+struct tag_node *tag_lookup(struct tag_list *, u_int16_t, int);
+int tag_add(struct tag_list *, u_int16_t, u_int16_t, u_int8_t *);
+int tag_pkt(struct tag_list *, u_long, u_int8_t *);
+void tag_hton(struct tag_list *);
+void tag_ntoh(struct tag_list *);
 
 struct pppoe_session {
 	LIST_ENTRY(pppoe_session)	s_next;
@@ -128,19 +128,19 @@ struct pppoe_session_master {
 
 extern struct pppoe_session_master session_master;
 
-void session_init __P((void));
-void session_destroy __P((struct pppoe_session *));
-struct pppoe_session *session_new __P((struct ether_addr *));
-struct pppoe_session *session_find_eaid __P((struct ether_addr *, u_int16_t));
-struct pppoe_session *session_find_fd __P((int));
+void session_init(void);
+void session_destroy(struct pppoe_session *);
+struct pppoe_session *session_new(struct ether_addr *);
+struct pppoe_session *session_find_eaid(struct ether_addr *, u_int16_t);
+struct pppoe_session *session_find_fd(int);
 
-int runppp __P((int, char *));
-int bpf_to_ppp __P((int, u_long, u_int8_t *));
+int runppp(int, char *);
+int bpf_to_ppp(int, u_long, u_int8_t *);
 int ppp_to_bpf __P((int, int, struct ether_addr *, struct ether_addr *,
     u_int16_t));
-int send_padt __P((int, struct ether_addr *, struct ether_addr *, u_int16_t));
+int send_padt(int, struct ether_addr *, struct ether_addr *, u_int16_t);
 void recv_debug __P((int, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-void debug_packet __P((u_int8_t *, int));
+void debug_packet(u_int8_t *, int);
 
-u_int32_t cookie_bake __P((void));
+u_int32_t cookie_bake(void);
diff --git a/usr.sbin/pppoe/server.c b/usr.sbin/pppoe/server.c
index 1c61b1e7274..d861f306af7 100644
--- a/usr.sbin/pppoe/server.c
+++ b/usr.sbin/pppoe/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.5 2001/11/29 16:49:09 miod Exp $	*/
+/*	$OpenBSD: server.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -62,7 +62,7 @@
 
 static char ac_cookie_key[8];
 
-static void getpackets __P((int, char *, struct ether_addr *));
+static void getpackets(int, char *, struct ether_addr *);
 
 static void recv_padi __P((int, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
@@ -75,9 +75,9 @@ static void send_pado __P((int, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
 static void send_pads __P((int, char *, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-static void key_gen __P((void));
-static u_int8_t *key_make __P((u_int8_t *, int, u_int8_t *, int));
-static int key_cmp __P((u_int8_t *, int, u_int8_t *, int, u_int8_t *, int));
+static void key_gen(void);
+static u_int8_t *key_make(u_int8_t *, int, u_int8_t *, int);
+static int key_cmp(u_int8_t *, int, u_int8_t *, int, u_int8_t *, int);
 
 void
 server_mode(bpffd, sysname, srvname, ea)