Final __P removal plus some cosmetic fixups

5 files changed, 17 insertions, 24 deletions

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 24967d48e31..9d6cbb0821d 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpf.c,v 1.31 2002/03/14 01:27:09 millert Exp $	*/
+/*	$OpenBSD: bpf.c,v 1.32 2002/03/14 03:16:10 millert Exp $	*/
 /*	$NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $	*/
 
 /*
@@ -89,8 +89,8 @@ void	bpf_detachd(struct bpf_d *);
 int	bpf_setif(struct bpf_d *, struct ifreq *);
 int	bpfselect(dev_t, int, struct proc *);
 static __inline void bpf_wakeup(struct bpf_d *);
-void	bpf_catchpacket __P((struct bpf_d *, u_char *, size_t, size_t,
-	    void (*)(const void *, void *, size_t)));
+void	bpf_catchpacket(struct bpf_d *, u_char *, size_t, size_t,
+	    void (*)(const void *, void *, size_t));
 void	bpf_reset_d(struct bpf_d *);
 
 int
diff --git a/sys/net/if_strip.c b/sys/net/if_strip.c
index e9c1a0c5085..70d432b3b54 100644
--- a/sys/net/if_strip.c
+++ b/sys/net/if_strip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_strip.c,v 1.17 2002/03/14 01:27:09 millert Exp $	*/
+/*	$OpenBSD: if_strip.c,v 1.18 2002/03/14 03:16:10 millert Exp $	*/
 /*	$NetBSD: if_strip.c,v 1.2.4.3 1996/08/03 00:58:32 jtc Exp $	*/
 /*	from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $	*/
 
@@ -259,10 +259,10 @@ struct st_header {
  * different STRIP implementations: *BSD, Linux, etc.
  *
  */
-static u_char* UnStuffData(u_char *src, u_char *end, u_char
+static u_char *UnStuffData(u_char *src, u_char *end, u_char
 				*dest, u_long dest_length); 
 
-static u_char* StuffData(u_char *src, u_long length, u_char *dest,
+static u_char *StuffData(u_char *src, u_long length, u_char *dest,
 			      u_char **code_ptr_ptr);
 
 static void RecvErr(char *msg, struct st_softc *sc);
@@ -1718,7 +1718,7 @@ typedef enum
 #define StuffData_FinishBlock(X) \
 	(*code_ptr = (X) ^ Stuff_Magic, code = Stuff_NoCode)
 
-static u_char*
+static u_char *
 StuffData(u_char *src, u_long length, u_char *dest, u_char **code_ptr_ptr)
 {
 	u_char *end = src + length;
@@ -1846,7 +1846,7 @@ StuffData(u_char *src, u_long length, u_char *dest, u_char **code_ptr_ptr)
  * allow a follow-on  call to resume correctly).
  */
 
-static u_char*
+static u_char *
 UnStuffData(u_char *src, u_char *end, u_char *dst, u_long dst_length)
 {
 	u_char *dst_end = dst + dst_length;
diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h
index 36d19e6d94d..1f2d1afaa57 100644
--- a/sys/net/ppp_defs.h
+++ b/sys/net/ppp_defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp_defs.h,v 1.11 2001/06/09 06:16:39 angelos Exp $	*/
+/*	$OpenBSD: ppp_defs.h,v 1.12 2002/03/14 03:16:10 millert Exp $	*/
 /*	$NetBSD: ppp_defs.h,v 1.1 1995/07/04 06:28:26 paulus Exp $	*/
 
 /*
@@ -159,11 +159,4 @@ struct ppp_idle {
     time_t recv_idle;		/* time since last NP packet received */
 };
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(x)	x
-#else
-#define __P(x)	()
-#endif
-#endif
 #endif /* _PPP_DEFS_H_ */
diff --git a/sys/net/radix.h b/sys/net/radix.h
index e2835f7dcc9..0aa628df683 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radix.h,v 1.6 2002/03/14 01:27:10 millert Exp $	*/
+/*	$OpenBSD: radix.h,v 1.7 2002/03/14 03:16:10 millert Exp $	*/
 /*	$NetBSD: radix.h,v 1.8 1996/02/13 22:00:37 christos Exp $	*/
 
 /*
@@ -121,8 +121,8 @@ struct radix_node_head {
 	struct	radix_node *(*rnh_lookup)	/* locate based on sockaddr */(void *v, void *mask, struct radix_node_head *head);
 	struct	radix_node *(*rnh_matchpkt)	/* locate based on packet hdr */(void *v, struct radix_node_head *head);
 	int	(*rnh_walktree)			/* traverse tree */
-		__P((struct radix_node_head *,
-		     int (*)(struct radix_node *, void *), void *));
+		(struct radix_node_head *,
+		     int (*)(struct radix_node *, void *), void *);
 	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
 };
 
@@ -145,8 +145,8 @@ struct radix_node_head {
 void	 rn_init(void);
 int	 rn_inithead(void **, int);
 int	 rn_refines(void *, void *);
-int	 rn_walktree __P((struct radix_node_head *,
-			  int (*)(struct radix_node *, void *), void *));
+int	 rn_walktree(struct radix_node_head *,
+			  int (*)(struct radix_node *, void *), void *);
 struct radix_node
 	 *rn_addmask(void *, int, int),
 	 *rn_addroute(void *, void *, struct radix_node_head *,
diff --git a/sys/net/route.h b/sys/net/route.h
index 2efa1615755..5a414b5c73e 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.13 2002/03/14 01:27:10 millert Exp $	*/
+/*	$OpenBSD: route.h,v 1.14 2002/03/14 03:16:10 millert Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -301,9 +301,9 @@ void	 rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *);
 int	 rt_setgate(struct rtentry *, struct sockaddr *,
 			 struct sockaddr *);
 void	 rt_setmetrics(u_long, struct rt_metrics *, struct rt_metrics *);
-int      rt_timer_add __P((struct rtentry *,
+int      rt_timer_add(struct rtentry *,
              void(*)(struct rtentry *, struct rttimer *),
-	     struct rttimer_queue *));
+	     struct rttimer_queue *);
 void	 rt_timer_init(void);
 struct rttimer_queue *
 	 rt_timer_queue_create(u_int);