Remove __P.

8 files changed, 139 insertions, 146 deletions

diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index af2e050..21d91bd 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -81,9 +81,9 @@ struct spansarp		*spansarp_arptab[SPANSARP_HASHSIZ] = {NULL};
 /*
  * Local functions
  */
-static int		spansarp_request __P((struct spansarp *));
-static void		spansarp_aging __P((struct atm_time *));
-static void		spansarp_retry __P((struct atm_time *));
+static int		spansarp_request(struct spansarp *);
+static void		spansarp_aging(struct atm_time *);
+static void		spansarp_retry(struct atm_time *);
 
 /*
  * Local variables
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index aff39b2..9985dcc 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -92,15 +92,14 @@ struct spanscls_hdr	spanscls_hdr = {
 /*
  * Local functions
  */
-static int	spanscls_ipact __P((struct ip_nif *));
-static int	spanscls_ipdact __P((struct ip_nif *));
-static int	spanscls_bcast_output __P((struct ip_nif *, KBuffer *));
-static void	spanscls_cpcs_data __P((void *, KBuffer *));
-static void	spanscls_connected __P((void *));
-static void	spanscls_cleared __P((void *, struct t_atm_cause *));
-static caddr_t	spanscls_getname __P((void *));
-static void	spanscls_pdu_print __P((struct spanscls *, KBuffer *,
-			char *));
+static int	spanscls_ipact(struct ip_nif *);
+static int	spanscls_ipdact(struct ip_nif *);
+static int	spanscls_bcast_output(struct ip_nif *, KBuffer *);
+static void	spanscls_cpcs_data(void *, KBuffer *);
+static void	spanscls_connected(void *);
+static void	spanscls_cleared(void *, struct t_atm_cause *);
+static caddr_t	spanscls_getname(void *);
+static void	spanscls_pdu_print(struct spanscls *, KBuffer *, char *);
 
 /*
  * Local variables
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 7766eb8..95aaa11 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -93,15 +93,15 @@ struct sp_info	spans_msgpool = {
 /*
  * Local functions
  */
-static int	spans_start __P((void));
-static int	spans_stop __P((void));
-static int	spans_attach __P((struct sigmgr *, struct atm_pif *));
-static int	spans_detach __P((struct atm_pif *));
-static int	spans_setup __P((Atm_connvc *, int *));
-static int	spans_release __P((struct vccb *, int *));
-static int	spans_accept __P((struct vccb *, int *));
-static int	spans_reject __P((struct vccb *, int *));
-static int	spans_ioctl __P((int, caddr_t, caddr_t));
+static int	spans_start(void);
+static int	spans_stop(void);
+static int	spans_attach(struct sigmgr *, struct atm_pif *);
+static int	spans_detach(struct atm_pif *);
+static int	spans_setup(Atm_connvc *, int *);
+static int	spans_release(struct vccb *, int *);
+static int	spans_accept(struct vccb *, int *);
+static int	spans_reject(struct vccb *, int *);
+static int	spans_ioctl(int, caddr_t, caddr_t);
 
 /*
  * Local variables
@@ -1082,8 +1082,8 @@ spans_ioctl(code, data, arg1)
  *
  *******************************************************************
  */
-static int	spans_doload __P((void));
-static int	spans_dounload __P((void));
+static int	spans_doload(void);
+static int	spans_dounload(void);
 
 /*
  * Generic module load processing
@@ -1242,7 +1242,7 @@ spans_mod(lkmtp, cmd, ver)
  *
  *******************************************************************
  */
-static void	spans_doload __P((void *));
+static void	spans_doload(void *);
 
 SYSINIT(atmspans, SI_SUB_PROTO_END, SI_ORDER_ANY, spans_doload, NULL)
 
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 8900cc2..6a214f0 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -426,12 +426,12 @@ xdr_opaque(xdrs, cp, cnt)
  */
 
 
-void		xdrmbuf_init __P((XDR *, KBuffer *, enum xdr_op));
-static bool_t	xdrmbuf_getlong __P((XDR *, long *));
-static bool_t	xdrmbuf_putlong __P((XDR *, const long *));
-static bool_t	xdrmbuf_getbytes __P((XDR *, char *, u_int));
-static bool_t	xdrmbuf_putbytes __P((XDR *, const char *, u_int));
-static u_int	xdrmbuf_getpos __P((XDR *));
+void		xdrmbuf_init(XDR *, KBuffer *, enum xdr_op);
+static bool_t	xdrmbuf_getlong(XDR *, long *);
+static bool_t	xdrmbuf_putlong(XDR *, const long *);
+static bool_t	xdrmbuf_getbytes(XDR *, char *, u_int);
+static bool_t	xdrmbuf_putbytes(XDR *, const char *, u_int);
+static u_int	xdrmbuf_getpos(XDR *);
 
 static struct	xdr_ops xdrmbuf_ops = {
 	xdrmbuf_getlong,
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 686eb53..187b245 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -69,24 +69,24 @@ __RCSID("@(#) $FreeBSD$");
 /*
  * External functions
  */
-void		xdrmbuf_init __P((XDR *, KBuffer *, enum xdr_op));
+void		xdrmbuf_init(XDR *, KBuffer *, enum xdr_op);
 
 /*
  * Local functions
  */
-static void	spans_host_link __P((struct spans *, long));
-static void	spans_status_ind __P((struct spans *, spans_msg *));
-static void	spans_status_rsp __P((struct spans *, spans_msg *));
-static void	spans_open_req __P((struct spans *, spans_msg *));
-static void	spans_open_rsp __P((struct spans *, spans_msg *));
-static void	spans_close_req __P((struct spans *, spans_msg *));
-static void	spans_close_rsp __P((struct spans *, spans_msg *));
-static void	spans_multi_req __P((struct spans *, spans_msg *));
-static void	spans_add_req __P((struct spans *, spans_msg *));
-static void	spans_join_req __P((struct spans *, spans_msg *));
-static void	spans_leave_req __P((struct spans *, spans_msg *));
-static void	spans_vcir_ind __P((struct spans *, spans_msg *));
-static void	spans_query_req __P((struct spans *, spans_msg *));
+static void	spans_host_link(struct spans *, long);
+static void	spans_status_ind(struct spans *, spans_msg *);
+static void	spans_status_rsp(struct spans *, spans_msg *);
+static void	spans_open_req(struct spans *, spans_msg *);
+static void	spans_open_rsp(struct spans *, spans_msg *);
+static void	spans_close_req(struct spans *, spans_msg *);
+static void	spans_close_rsp(struct spans *, spans_msg *);
+static void	spans_multi_req(struct spans *, spans_msg *);
+static void	spans_add_req(struct spans *, spans_msg *);
+static void	spans_join_req(struct spans *, spans_msg *);
+static void	spans_leave_req(struct spans *, spans_msg *);
+static void	spans_vcir_ind(struct spans *, spans_msg *);
+static void	spans_query_req(struct spans *, spans_msg *);
 
 
 /*
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 857a3ed..9ab7dfc 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -68,57 +68,57 @@ __RCSID("@(#) $FreeBSD$");
 /*
  * Local functions
  */
-static void	spans_msgtype_str __P((spans_msgtype *, char *, int));
-static void	spans_print_msgbody __P((spans_msgbody *));
-static void	spans_result_str __P((spans_result *, char *, int));
+static void	spans_msgtype_str(spans_msgtype *, char *, int);
+static void	spans_print_msgbody(spans_msgbody *);
+static void	spans_result_str(spans_result *, char *, int);
 
 #ifdef LONGPRINT
 
-static void	inc_indent __P((void));
-static void	dec_indent __P((void));
-static void	spans_aal_str __P((spans_aal *, char *, int));
-static void	spans_query_type_str __P((spans_query_type *, char *, int));
-static void	spans_state_str __P((spans_query_type *, char *, int));
-static void	spans_print_version __P((spans_version *));
-static void	spans_print_vpvc __P((spans_vpvc *));
-static void	spans_print_vpvc_pref __P((spans_vpvc_pref *));
-static void	spans_print_addr __P((spans_addr *));
-static void	spans_print_sap __P((spans_sap *));
-static void	spans_print_atm_conn __P((spans_atm_conn *));
-static void	spans_print_resrc __P((spans_resrc *));
-static void	spans_print_aal __P((spans_aal *));
-static void	spans_print_result __P((spans_result *));
-static void	spans_print_msgtype __P((spans_msgtype *));
-static void	spans_print_parm_stat_req __P((spans_parm_stat_req *));
-static void	spans_print_parm_stat_ind __P((spans_parm_stat_ind *));
-static void	spans_print_parm_stat_rsp __P((spans_parm_stat_rsp *));
-static void	spans_print_parm_open_req __P((spans_parm_open_req *));
-static void	spans_print_parm_open_ind __P((spans_parm_open_ind *));
-static void	spans_print_parm_open_rsp __P((spans_parm_open_rsp *));
-static void	spans_print_parm_open_cnf __P((spans_parm_open_cnf *));
-static void	spans_print_parm_close_req __P((spans_parm_close_req *));
-static void	spans_print_parm_close_ind __P((spans_parm_close_ind *));
-static void	spans_print_parm_close_rsp __P((spans_parm_close_rsp *));
-static void	spans_print_parm_close_cnf __P((spans_parm_close_cnf *));
-static void	spans_print_parm_rclose_req __P((spans_parm_rclose_req *));
-static void	spans_print_parm_rclose_ind __P((spans_parm_rclose_ind *));
-static void	spans_print_parm_rclose_rsp __P((spans_parm_rclose_rsp *));
-static void	spans_print_parm_rclose_cnf __P((spans_parm_rclose_cnf *));
-static void	spans_print_parm_multi_req __P((spans_parm_multi_req *));
-static void	spans_print_parm_multi_ind __P((spans_parm_multi_ind *));
-static void	spans_print_parm_multi_rsp __P((spans_parm_multi_rsp *));
-static void	spans_print_parm_multi_cnf __P((spans_parm_multi_cnf *));
-static void	spans_print_parm_add_req __P((spans_parm_add_req *));
-static void	spans_print_parm_add_ind __P((spans_parm_add_ind *));
-static void	spans_print_parm_add_rsp __P((spans_parm_add_rsp *));
-static void	spans_print_parm_add_cnf __P((spans_parm_add_cnf *));
-static void	spans_print_parm_join_req __P((spans_parm_join_req *));
-static void	spans_print_parm_join_cnf __P((spans_parm_join_cnf *));
-static void	spans_print_parm_leave_req __P((spans_parm_leave_req *));
-static void	spans_print_parm_leave_cnf __P((spans_parm_leave_cnf *));
-static void	spans_print_parm_vcir_ind __P((spans_parm_vcir_ind *));
-static void	spans_print_parm_query_req __P((spans_parm_query_req *));
-static void	spans_print_parm_query_rsp __P((spans_parm_query_rsp *));
+static void	inc_indent(void);
+static void	dec_indent(void);
+static void	spans_aal_str(spans_aal *, char *, int);
+static void	spans_query_type_str(spans_query_type *, char *, int);
+static void	spans_state_str(spans_query_type *, char *, int);
+static void	spans_print_version(spans_version *);
+static void	spans_print_vpvc(spans_vpvc *);
+static void	spans_print_vpvc_pref(spans_vpvc_pref *);
+static void	spans_print_addr(spans_addr *);
+static void	spans_print_sap(spans_sap *);
+static void	spans_print_atm_conn(spans_atm_conn *);
+static void	spans_print_resrc(spans_resrc *);
+static void	spans_print_aal(spans_aal *);
+static void	spans_print_result(spans_result *);
+static void	spans_print_msgtype(spans_msgtype *);
+static void	spans_print_parm_stat_req(spans_parm_stat_req *);
+static void	spans_print_parm_stat_ind(spans_parm_stat_ind *);
+static void	spans_print_parm_stat_rsp(spans_parm_stat_rsp *);
+static void	spans_print_parm_open_req(spans_parm_open_req *);
+static void	spans_print_parm_open_ind(spans_parm_open_ind *);
+static void	spans_print_parm_open_rsp(spans_parm_open_rsp *);
+static void	spans_print_parm_open_cnf(spans_parm_open_cnf *);
+static void	spans_print_parm_close_req(spans_parm_close_req *);
+static void	spans_print_parm_close_ind(spans_parm_close_ind *);
+static void	spans_print_parm_close_rsp(spans_parm_close_rsp *);
+static void	spans_print_parm_close_cnf(spans_parm_close_cnf *);
+static void	spans_print_parm_rclose_req(spans_parm_rclose_req *);
+static void	spans_print_parm_rclose_ind(spans_parm_rclose_ind *);
+static void	spans_print_parm_rclose_rsp(spans_parm_rclose_rsp *);
+static void	spans_print_parm_rclose_cnf(spans_parm_rclose_cnf *);
+static void	spans_print_parm_multi_req(spans_parm_multi_req *);
+static void	spans_print_parm_multi_ind(spans_parm_multi_ind *);
+static void	spans_print_parm_multi_rsp(spans_parm_multi_rsp *);
+static void	spans_print_parm_multi_cnf(spans_parm_multi_cnf *);
+static void	spans_print_parm_add_req(spans_parm_add_req *);
+static void	spans_print_parm_add_ind(spans_parm_add_ind *);
+static void	spans_print_parm_add_rsp(spans_parm_add_rsp *);
+static void	spans_print_parm_add_cnf(spans_parm_add_cnf *);
+static void	spans_print_parm_join_req(spans_parm_join_req *);
+static void	spans_print_parm_join_cnf(spans_parm_join_cnf *);
+static void	spans_print_parm_leave_req(spans_parm_leave_req *);
+static void	spans_print_parm_leave_cnf(spans_parm_leave_cnf *);
+static void	spans_print_parm_vcir_ind(spans_parm_vcir_ind *);
+static void	spans_print_parm_query_req(spans_parm_query_req *);
+static void	spans_print_parm_query_rsp(spans_parm_query_rsp *);
 
 
 /*
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 16b89cc..b4f2d970 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -67,10 +67,10 @@ __RCSID("@(#) $FreeBSD$");
 /*
  * Internal functions
  */
-caddr_t	spans_getname __P((void *));
-void	spans_connected __P((void *));
-void	spans_cleared __P((void *, struct t_atm_cause *));
-void	spans_cpcs_data __P((void *, KBuffer *));
+caddr_t	spans_getname(void *);
+void	spans_connected(void *);
+void	spans_cleared(void *, struct t_atm_cause *);
+void	spans_cpcs_data(void *, KBuffer *);
 
 
 /*
diff --git a/sys/netatm/spans/spans_var.h b/sys/netatm/spans/spans_var.h
index 3f0dbb3..a8a9ebe 100644
--- a/sys/netatm/spans/spans_var.h
+++ b/sys/netatm/spans/spans_var.h
@@ -55,7 +55,7 @@ struct	spans {
 	struct siginst	sp_inst;	/* Header */
 	struct atm_time	sp_time;	/* Timer controls */
 	void		(*sp_lower)	/* Lower command handler */
-				__P((int, void *, int, int));
+				(int, void *, int, int);
 	Atm_connection	*sp_conn;	/* Signalling connection */
 	long		sp_s_epoch;	/* Switch epoch */
 	long		sp_h_epoch;	/* Host epoch */
@@ -178,72 +178,66 @@ struct spans_vccb {
 struct ipvcc;
 
 	/* spans_arp.c */
-int		spansarp_svcout __P((struct ipvcc *, struct in_addr *));
-int		spansarp_svcin __P((struct ipvcc *, Atm_addr *, Atm_addr *));
-int		spansarp_svcactive __P((struct ipvcc *));
-void		spansarp_vcclose __P((struct ipvcc *));
-void		spansarp_ipact __P((struct spanscls *));
-void		spansarp_ipdact __P((struct spanscls *));
-void		spansarp_stop __P((void));
-void		spansarp_input __P((struct spanscls *, KBuffer *));
-int		spansarp_ioctl __P((int, caddr_t, caddr_t));
+int		spansarp_svcout(struct ipvcc *, struct in_addr *);
+int		spansarp_svcin(struct ipvcc *, Atm_addr *, Atm_addr *);
+int		spansarp_svcactive(struct ipvcc *);
+void		spansarp_vcclose(struct ipvcc *);
+void		spansarp_ipact(struct spanscls *);
+void		spansarp_ipdact(struct spanscls *);
+void		spansarp_stop(void);
+void		spansarp_input(struct spanscls *, KBuffer *);
+int		spansarp_ioctl(int, caddr_t, caddr_t);
 
 	/* spans_cls.c */
-int		spanscls_start __P((void));
-void		spanscls_stop __P((void));
-int		spanscls_attach __P((struct spans *));
-void		spanscls_detach __P((struct spans *));
-void		spanscls_closevc __P((struct spanscls *,
-				struct t_atm_cause *));
+int		spanscls_start(void);
+void		spanscls_stop(void);
+int		spanscls_attach(struct spans *);
+void		spanscls_detach(struct spans *);
+void		spanscls_closevc(struct spanscls *, struct t_atm_cause *);
 
 	/* spans_if.c */
-int		spans_abort __P((struct vccb *));
-int		spans_free __P((struct vccb *));
+int		spans_abort(struct vccb *);
+int		spans_free(struct vccb *);
 
 	/* spans_msg.c */
-int		spans_send_msg __P((struct spans *, spans_msg *));
-int		spans_send_open_req __P((struct spans *,
-				struct spans_vccb *));
-int		spans_send_open_rsp __P((struct spans *,
+int		spans_send_msg(struct spans *, spans_msg *);
+int		spans_send_open_req(struct spans *, struct spans_vccb *);
+int		spans_send_open_rsp(struct spans *,
 				struct spans_vccb *,
-				spans_result));
-int		spans_send_close_req __P((struct spans *,
-				struct spans_vccb *));
-void		spans_rcv_msg __P((struct spans *, KBuffer *));
+				spans_result);
+int		spans_send_close_req(struct spans *,
+				struct spans_vccb *);
+void		spans_rcv_msg(struct spans *, KBuffer *);
 
 	/* spans_print.c */
-void		spans_print_msg __P((spans_msg *));
+void		spans_print_msg(spans_msg *);
 
 	/* spans_proto.c */
-void		spans_timer __P((struct atm_time *));
-void		spans_vctimer __P((struct atm_time *));
-void		spans_upper __P((int, void *, int, int));
-void		spans_notify __P((void *, int, int));
+void		spans_timer(struct atm_time *);
+void		spans_vctimer(struct atm_time *);
+void		spans_upper(int, void *, int, int);
+void		spans_notify(void *, int, int);
 
 	/* spans_subr.c */
-int		spans_open_vcc __P((struct spans *, Atm_connvc *));
-int		spans_close_vcc __P((struct spans *,
-				struct spans_vccb *, int));
-int		spans_clear_vcc __P((struct spans *,
-				struct spans_vccb *));
-void		spans_switch_reset __P((struct spans *, int));
+int		spans_open_vcc(struct spans *, Atm_connvc *);
+int		spans_close_vcc(struct spans *, struct spans_vccb *, int);
+int		spans_clear_vcc(struct spans *, struct spans_vccb *);
+void		spans_switch_reset(struct spans *, int);
 
 	/* spans_util.c */
-int		spans_get_spans_sap __P((Sap_t, spans_sap *));
-int		spans_get_local_sap __P((spans_sap, Sap_t *));
-int		spans_ephemeral_sap __P((struct spans *));
-int		spans_get_spans_aal __P((Aal_t, spans_aal *));
-int		spans_get_local_aal __P((spans_aal, Aal_t *));
-int		spans_verify_vccb __P((struct spans *,
-				struct spans_vccb *));
+int		spans_get_spans_sap(Sap_t, spans_sap *);
+int		spans_get_local_sap(spans_sap, Sap_t *);
+int		spans_ephemeral_sap(struct spans *);
+int		spans_get_spans_aal(Aal_t, spans_aal *);
+int		spans_get_local_aal(spans_aal, Aal_t *);
+int		spans_verify_vccb(struct spans *, struct spans_vccb *);
 struct spans_vccb *
-		spans_find_vpvc __P((struct spans *, int, int, u_char));
+		spans_find_vpvc(struct spans *, int, int, u_char);
 struct spans_vccb *
-		spans_find_conn __P((struct spans *,
-				struct spans_atm_conn *));
-spans_vpvc	spans_alloc_vpvc __P((struct spans *));
-char *		spans_addr_print __P((struct spans_addr *));
-void		spans_dump_buffer __P((KBuffer *));
+		spans_find_conn(struct spans *, struct spans_atm_conn *);
+spans_vpvc	spans_alloc_vpvc(struct spans *);
+char *		spans_addr_print(struct spans_addr *);
+void		spans_dump_buffer(KBuffer *);
 
 
 /*