[Midnightbsd-cvs] src [7560] trunk/sys: use proper ansi c types

[laffer1 at midnightbsd.org]

Revision: 7560
          http://svnweb.midnightbsd.org/src/?rev=7560
Author:   laffer1
Date:     2016-05-21 10:28:54 -0400 (Sat, 21 May 2016)
Log Message:
-----------
use proper ansi c types

Modified Paths:
--------------
    trunk/sys/kern/uipc_syscalls.c
    trunk/sys/sys/socketvar.h

Modified: trunk/sys/kern/uipc_syscalls.c
===================================================================
--- trunk/sys/kern/uipc_syscalls.c	2016-05-19 22:01:36 UTC (rev 7559)
+++ trunk/sys/kern/uipc_syscalls.c	2016-05-21 14:28:54 UTC (rev 7560)
@@ -104,6 +104,7 @@
 			int compat);
 static int getpeername1(struct thread *td, struct getpeername_args *uap,
 			int compat);
+static int sockargs(struct mbuf **, char *, socklen_t, int);
 
 /*
  * NSFBUFS-related variables and associated sysctls
@@ -1644,19 +1645,13 @@
 }
 #endif /* COMPAT_OLDSOCK */
 
-int
-sockargs(mp, buf, buflen, type)
-	struct mbuf **mp;
-	caddr_t buf;
-	int buflen, type;
+static int
+sockargs(struct mbuf **mp, char *buf, socklen_t buflen, int type)
 {
 	struct sockaddr *sa;
 	struct mbuf *m;
 	int error;
 
-	if (buflen < 0)
-		return (EINVAL);
-
 	if ((u_int)buflen > MLEN) {
 #ifdef COMPAT_OLDSOCK
 		if (type == MT_SONAME && (u_int)buflen <= 112)
@@ -1670,7 +1665,7 @@
 	if ((u_int)buflen > MLEN)
 		MCLGET(m, M_WAIT);
 	m->m_len = buflen;
-	error = copyin(buf, mtod(m, caddr_t), (u_int)buflen);
+	error = copyin(buf, mtod(m, void *), buflen);
 	if (error)
 		(void) m_free(m);
 	else {

Modified: trunk/sys/sys/socketvar.h
===================================================================
--- trunk/sys/sys/socketvar.h	2016-05-19 22:01:36 UTC (rev 7559)
+++ trunk/sys/sys/socketvar.h	2016-05-21 14:28:54 UTC (rev 7560)
@@ -313,7 +313,6 @@
 /*
  * From uipc_socket and friends
  */
-int	sockargs(struct mbuf **mp, caddr_t buf, int buflen, int type);
 int	getsockaddr(struct sockaddr **namp, caddr_t uaddr, size_t len);
 void	soabort(struct socket *so);
 int	soaccept(struct socket *so, struct sockaddr **nam);