Uniformized pr_ctlinput protosw functions. The third arg is now `void

*' instead of caddr_t and it isn't optional (it never was).  Most of the
netipx (and netns) pr_ctlinput functions abuse the second arg instead of
using the third arg but fixing this is beyond the scope of this round
of changes.

6 files changed, 23 insertions, 15 deletions

diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index c49ad1a..83fa014 100644
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx.h
  *
- * $Id: ipx.h,v 1.4 1995/11/04 09:02:37 julian Exp $
+ * $Id: ipx.h,v 1.5 1995/11/24 12:25:02 bde Exp $
  */
 
 #ifndef _NETIPX_IPX_H_
@@ -174,12 +174,13 @@ extern u_char ipxctlerrmap[];
 extern struct ipxpcb ipxrawpcb;
 
 struct route;
+struct sockaddr;
 struct socket;
 void	ipx_abort __P((struct ipxpcb *ipxp));
 u_short	ipx_cksum __P((struct mbuf *m, int len));
 int	ipx_control __P((struct socket *so, int cmd, caddr_t data,
 			 struct ifnet *ifp));
-void	ipx_ctlinput __P((int cmd, caddr_t arg));
+void	ipx_ctlinput __P((int cmd, struct sockaddr *arg_as_sa, void *dummy));
 int	ipx_ctloutput __P((int req, struct socket *so, int level, int name,
 			   struct mbuf **value));
 int	ipx_do_route __P((struct ipx_addr *src, struct route *ro));
diff --git a/sys/netipx/ipx_error.c b/sys/netipx/ipx_error.c
index bdd401f..20fc5f2 100644
--- a/sys/netipx/ipx_error.c
+++ b/sys/netipx/ipx_error.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_error.c
  *
- * $Id: ipx_error.c,v 1.2 1995/10/31 23:36:22 julian Exp $
+ * $Id: ipx_error.c,v 1.3 1995/11/04 09:02:43 julian Exp $
  */
 
 #include <sys/param.h>
@@ -312,11 +312,13 @@ ipx_err_input(m)
 
 		switch(ep->ipx_err_ipx.ipx_pt) {
 		case IPXPROTO_SPX:
-			spx_ctlinput(code, (caddr_t)ep);
+			spx_ctlinput(code, (/* XXX */ struct sockaddr *)ep,
+				     (void *)NULL);
 			break;
 
 		default:
-			ipx_ctlinput(code, (caddr_t)ep);
+			ipx_ctlinput(code, (/* XXX */ struct sockaddr *)ep,
+				     (void *)NULL);
 		}
 		
 		goto freeit;
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 25bb85f..3b77ac4 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_input.c
  *
- * $Id: ipx_input.c,v 1.4 1995/11/04 09:02:54 julian Exp $
+ * $Id: ipx_input.c,v 1.5 1995/11/24 11:43:52 bde Exp $
  */
 
 #include <sys/param.h>
@@ -280,10 +280,12 @@ u_char ipxctlerrmap[PRC_NCMDS] = {
 };
 
 void
-ipx_ctlinput(cmd, arg)
+ipx_ctlinput(cmd, arg_as_sa, dummy)
 	int cmd;
-	caddr_t arg;
+	struct sockaddr *arg_as_sa;	/* XXX should be swapped with dummy */
+	void *dummy;
 {
+	caddr_t arg = (/* XXX */ caddr_t)arg_as_sa;
 	struct ipx_addr *ipx;
 	struct ipxpcb *ipxp;
 	struct ipx_errp *errp;
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 168b23c..f6da0ba 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx_ip.c
  *
- * $Id: ipx_ip.c,v 1.4 1995/11/04 09:02:58 julian Exp $
+ * $Id: ipx_ip.c,v 1.5 1995/11/24 12:07:33 bde Exp $
  */
 
 /*
@@ -394,9 +394,10 @@ struct ifnet *ifp;
 }
 
 void
-ipxip_ctlinput(cmd, sa)
+ipxip_ctlinput(cmd, sa, dummy)
 	int cmd;
 	struct sockaddr *sa;
+	void *dummy;
 {
 	/*extern u_char inetctlerrmap[]; */ /*XXX*/ /*JRE*/
 	struct sockaddr_in *sin;
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 4ef9b30..3ceb48a 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx.h
  *
- * $Id: spx.h,v 1.4 1995/11/04 09:03:29 julian Exp $
+ * $Id: spx.h,v 1.5 1995/11/24 12:25:11 bde Exp $
  */
 
 #ifndef _NETIPX_SPX_H_
@@ -172,7 +172,7 @@ struct spxpcb {
 void	spx_abort __P((struct ipxpcb *ipxp));
 struct spxpcb *
 	spx_close __P((struct spxpcb *cb));
-void	spx_ctlinput __P((int cmd, caddr_t arg));
+void	spx_ctlinput __P((int cmd, struct sockaddr *arg_as_sa, void *dummy));
 int	spx_ctloutput __P((int req, struct socket *so, int level, int name,
 			   struct mbuf **value));
 struct spxpcb *
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index a074bea..656a1fb 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_usrreq.h
  *
- * $Id: spx_usrreq.c,v 1.5 1995/11/24 11:43:55 bde Exp $
+ * $Id: spx_usrreq.c,v 1.6 1995/11/24 12:01:08 bde Exp $
  */
 
 #include <sys/param.h>
@@ -585,10 +585,12 @@ present:
 }
 
 void
-spx_ctlinput(cmd, arg)
+spx_ctlinput(cmd, arg_as_sa, dummy)
 	int cmd;
-	caddr_t arg;
+	struct sockaddr *arg_as_sa;	/* XXX should be swapped with dummy */
+	void *dummy;
 {
+	caddr_t arg = (/* XXX */ caddr_t)arg_as_sa;
 	struct ipx_addr *na;
 	struct ipx_errp *errp = (struct ipx_errp *)arg;
 	struct ipxpcb *ipxp;