Final __P removal plus some cosmetic fixups

7 files changed, 20 insertions, 20 deletions

diff --git a/sys/altq/altq_blue.c b/sys/altq/altq_blue.c
index ef490d1b314..263ba50b0af 100644
--- a/sys/altq/altq_blue.c
+++ b/sys/altq/altq_blue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_blue.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
+/*	$OpenBSD: altq_blue.c,v 1.4 2002/03/14 03:15:50 millert Exp $	*/
 /*	$KAME: altq_blue.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -100,7 +100,7 @@ static blue_queue_t *blue_list = NULL;
 
 /* internal function prototypes */
 static int blue_enqueue(struct ifaltq *, struct mbuf *,
-			     struct altq_pktattr *);
+			struct altq_pktattr *);
 static struct mbuf *blue_dequeue(struct ifaltq *, int);
 static int drop_early(blue_t *);
 static int mark_ecn(struct mbuf *, struct altq_pktattr *, int);
diff --git a/sys/altq/altq_blue.h b/sys/altq/altq_blue.h
index 134fe07c916..c816aa659cb 100644
--- a/sys/altq/altq_blue.h
+++ b/sys/altq/altq_blue.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_blue.h,v 1.2 2002/03/14 01:26:26 millert Exp $	*/
+/*	$OpenBSD: altq_blue.h,v 1.3 2002/03/14 03:15:50 millert Exp $	*/
 /*	$KAME: altq_blue.h,v 1.5 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -111,7 +111,7 @@ typedef struct blue_queue {
 
 extern int blue_init(blue_t *, int, int, int, int);
 extern int blue_addq(blue_t *, class_queue_t *, struct mbuf *,
-			 struct altq_pktattr *);
+		     struct altq_pktattr *);
 extern struct mbuf *blue_getq(blue_t *, class_queue_t *);
 
 #endif /* _KERNEL */
diff --git a/sys/altq/altq_cbq.c b/sys/altq/altq_cbq.c
index a3a07578521..3dd5717740f 100644
--- a/sys/altq/altq_cbq.c
+++ b/sys/altq/altq_cbq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_cbq.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
+/*	$OpenBSD: altq_cbq.c,v 1.4 2002/03/14 03:15:50 millert Exp $	*/
 /*	$KAME: altq_cbq.c,v 1.9 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -63,7 +63,7 @@ static int	cbq_add_class(struct cbq_add_class *);
 static int	cbq_delete_class(struct cbq_delete_class *);
 static int	cbq_modify_class(struct cbq_modify_class *);
 static int 	cbq_class_create(cbq_state_t *, struct cbq_add_class *,
-				      struct rm_class *, struct rm_class *);
+				 struct rm_class *, struct rm_class *);
 static int	cbq_class_destroy(cbq_state_t *, struct rm_class *);
 static struct rm_class  *clh_to_clp(cbq_state_t *, u_long);
 static int	cbq_add_filter(struct cbq_add_filter *);
@@ -76,7 +76,7 @@ static int	cbq_set_enable(struct cbq_interface *, int);
 static int	cbq_ifattach(struct cbq_interface *);
 static int	cbq_ifdetach(struct cbq_interface *);
 static int	cbq_enqueue(struct ifaltq *, struct mbuf *,
-				 struct altq_pktattr *);
+			    struct altq_pktattr *);
 static struct mbuf 	*cbq_dequeue(struct ifaltq *, int);
 static void	cbqrestart(struct ifaltq *);
 static void 	get_class_stats(class_stats_t *, struct rm_class *);
diff --git a/sys/altq/altq_cdnr.c b/sys/altq/altq_cdnr.c
index 3b96ded5fd3..bc6d2ac776a 100644
--- a/sys/altq/altq_cdnr.c
+++ b/sys/altq/altq_cdnr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_cdnr.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
+/*	$OpenBSD: altq_cdnr.c,v 1.4 2002/03/14 03:15:50 millert Exp $	*/
 /*	$KAME: altq_cdnr.c,v 1.8 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -68,8 +68,8 @@ static int altq_cdnr_input(struct mbuf *, int);
 static struct top_cdnr *tcb_lookup(char *ifname);
 static struct cdnr_block *cdnr_handle2cb(u_long);
 static u_long cdnr_cb2handle(struct cdnr_block *);
-static void *cdnr_cballoc __P((struct top_cdnr *, int,
-       struct tc_action *(*)(struct cdnr_block *, struct cdnr_pktinfo *)));
+static void *cdnr_cballoc(struct top_cdnr *, int,
+       struct tc_action *(*)(struct cdnr_block *, struct cdnr_pktinfo *));
 static void cdnr_cbdestroy(void *);
 static int tca_verify_action(struct tc_action *);
 static void tca_import_action(struct tc_action *, struct tc_action *);
diff --git a/sys/altq/altq_fifoq.c b/sys/altq/altq_fifoq.c
index 4649dcd3659..3177e9f62aa 100644
--- a/sys/altq/altq_fifoq.c
+++ b/sys/altq/altq_fifoq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_fifoq.c,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
+/*	$OpenBSD: altq_fifoq.c,v 1.4 2002/03/14 03:15:50 millert Exp $	*/
 /*	$KAME: altq_fifoq.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -59,7 +59,7 @@ static fifoq_state_t *fifoq_list = NULL;
 
 /* internal function prototypes */
 static int		fifoq_enqueue(struct ifaltq *, struct mbuf *,
-					   struct altq_pktattr *);
+				      struct altq_pktattr *);
 static struct mbuf 	*fifoq_dequeue(struct ifaltq *, int);
 static int 		fifoq_detach(fifoq_state_t *);
 static int		fifoq_request(struct ifaltq *, int, void *);
diff --git a/sys/altq/altq_rmclass.h b/sys/altq/altq_rmclass.h
index 077e1279c55..91cf4b29ef9 100644
--- a/sys/altq/altq_rmclass.h
+++ b/sys/altq/altq_rmclass.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rmclass.h,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
+/*	$OpenBSD: altq_rmclass.h,v 1.4 2002/03/14 03:15:50 millert Exp $	*/
 /*	$KAME: altq_rmclass.h,v 1.6 2000/12/09 09:22:44 kjc Exp $	*/
 
 /*
@@ -240,17 +240,17 @@ struct rm_ifdat {
 
 #define	is_a_parent_class(cl)	((cl)->children_ != NULL)
 
-extern rm_class_t *rmc_newclass __P((int, struct rm_ifdat *, u_int,
+extern rm_class_t *rmc_newclass(int, struct rm_ifdat *, u_int,
 				     void (*)(struct rm_class *,
 					      struct rm_class *),
 				     int, struct rm_class *, struct rm_class *,
-				     u_int, int, u_int, int, int));
+				     u_int, int, u_int, int, int);
 extern void	rmc_delete_class(struct rm_ifdat *, struct rm_class *);
 extern int 	rmc_modclass(struct rm_class *, u_int, int,
 				  u_int, int, u_int, int);
-extern void	rmc_init __P((struct ifaltq *, struct rm_ifdat *, u_int,
+extern void	rmc_init(struct ifaltq *, struct rm_ifdat *, u_int,
 			      void (*)(struct ifaltq *),
-			      int, int, u_int, int, u_int, int));
+			      int, int, u_int, int, u_int, int);
 extern int	rmc_queue_packet(struct rm_class *, mbuf_t *);
 extern mbuf_t	*rmc_dequeue_next(struct rm_ifdat *, int);
 extern void	rmc_update_class_util(struct rm_ifdat *);
diff --git a/sys/altq/if_altq.h b/sys/altq/if_altq.h
index bf1cbf369cf..365149e7887 100644
--- a/sys/altq/if_altq.h
+++ b/sys/altq/if_altq.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_altq.h,v 1.3 2002/03/14 01:26:26 millert Exp $	*/
+/*	$OpenBSD: if_altq.h,v 1.4 2002/03/14 03:15:50 millert Exp $	*/
 /*	$KAME: if_altq.h,v 1.6 2001/01/29 19:59:09 itojun Exp $	*/
 
 /*
@@ -148,13 +148,13 @@ struct tb_regulator {
 #define	ALTQ_IS_EMPTY(ifq)		((ifq)->ifq_len == 0)
 #define	TBR_IS_ENABLED(ifq)		((ifq)->altq_tbr != NULL)
 
-extern int altq_attach __P((struct ifaltq *, int, void *,
+extern int altq_attach(struct ifaltq *, int, void *,
 			    int (*)(struct ifaltq *, struct mbuf *,
 				    struct altq_pktattr *),
 			    struct mbuf *(*)(struct ifaltq *, int), 
 			    int (*)(struct ifaltq *, int, void *),
 			    void *,
-			    void *(*)(void *, struct mbuf *, int)));
+			    void *(*)(void *, struct mbuf *, int));
 extern int altq_detach(struct ifaltq *);
 extern int altq_enable(struct ifaltq *);
 extern int altq_disable(struct ifaltq *);