deal with socklen_t

16 files changed, 38 insertions, 34 deletions

diff --git a/lib/libc_r/uthread/uthread_accept.c b/lib/libc_r/uthread/uthread_accept.c
index 5a6bd90fe9f..95f8c10b56c 100644
--- a/lib/libc_r/uthread/uthread_accept.c
+++ b/lib/libc_r/uthread/uthread_accept.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_accept.c,v 1.2 1999/01/06 05:29:21 d Exp $
+ * $OpenBSD: uthread_accept.c,v 1.3 1999/02/16 16:39:59 deraadt Exp $
  */
 #include <errno.h>
 #include <unistd.h>
@@ -41,7 +41,7 @@
 #include "pthread_private.h"
 
 int
-accept(int fd, struct sockaddr * name, int *namelen)
+accept(int fd, struct sockaddr * name, socklen_t *namelen)
 {
 	int             ret;
 
diff --git a/lib/libc_r/uthread/uthread_bind.c b/lib/libc_r/uthread/uthread_bind.c
index b638704dff3..644b31a0197 100644
--- a/lib/libc_r/uthread/uthread_bind.c
+++ b/lib/libc_r/uthread/uthread_bind.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_bind.c,v 1.2 1999/01/06 05:29:22 d Exp $
+ * $OpenBSD: uthread_bind.c,v 1.3 1999/02/16 16:39:59 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-bind(int fd, const struct sockaddr * name, int namelen)
+bind(int fd, const struct sockaddr * name, socklen_t namelen)
 {
 	int             ret;
 
diff --git a/lib/libc_r/uthread/uthread_connect.c b/lib/libc_r/uthread/uthread_connect.c
index 37ed517ca4b..59fc0724f47 100644
--- a/lib/libc_r/uthread/uthread_connect.c
+++ b/lib/libc_r/uthread/uthread_connect.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_connect.c,v 1.1 1998/08/27 09:00:58 d Exp $
+ * $OpenBSD: uthread_connect.c,v 1.2 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
@@ -40,10 +40,11 @@
 #include "pthread_private.h"
 
 int
-connect(int fd, const struct sockaddr * name, int namelen)
+connect(int fd, const struct sockaddr * name, socklen_t namelen)
 {
 	struct sockaddr tmpname;
-	int             errnolen, ret, tmpnamelen;
+	int             errnolen, ret;
+	socklen_t	tmpnamelen;
 
 	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
 		if ((ret = _thread_sys_connect(fd, name, namelen)) < 0) {
diff --git a/lib/libc_r/uthread/uthread_getpeername.c b/lib/libc_r/uthread/uthread_getpeername.c
index 73c73e23ab7..adb3ab3587b 100644
--- a/lib/libc_r/uthread/uthread_getpeername.c
+++ b/lib/libc_r/uthread/uthread_getpeername.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_getpeername.c,v 1.2 1999/01/06 05:29:24 d Exp $
+ * $OpenBSD: uthread_getpeername.c,v 1.3 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-getpeername(int fd, struct sockaddr * peer, int *paddrlen)
+getpeername(int fd, struct sockaddr *peer, socklen_t *paddrlen)
 {
 	int             ret;
 
diff --git a/lib/libc_r/uthread/uthread_getsockname.c b/lib/libc_r/uthread/uthread_getsockname.c
index c20e73ae8ce..4ed580dc2cf 100644
--- a/lib/libc_r/uthread/uthread_getsockname.c
+++ b/lib/libc_r/uthread/uthread_getsockname.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_getsockname.c,v 1.2 1999/01/06 05:29:24 d Exp $
+ * $OpenBSD: uthread_getsockname.c,v 1.3 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-getsockname(int s, struct sockaddr * name, int *namelen)
+getsockname(int s, struct sockaddr * name, socklen_t *namelen)
 {
 	int             ret;
 
diff --git a/lib/libc_r/uthread/uthread_getsockopt.c b/lib/libc_r/uthread/uthread_getsockopt.c
index cb1aa034497..7205ac345a3 100644
--- a/lib/libc_r/uthread/uthread_getsockopt.c
+++ b/lib/libc_r/uthread/uthread_getsockopt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_getsockopt.c,v 1.2 1999/01/06 05:29:24 d Exp $
+ * $OpenBSD: uthread_getsockopt.c,v 1.3 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-getsockopt(int fd, int level, int optname, void *optval, int *optlen)
+getsockopt(int fd, int level, int optname, void *optval, socklen_t *optlen)
 {
 	int             ret;
 
diff --git a/lib/libc_r/uthread/uthread_recvfrom.c b/lib/libc_r/uthread/uthread_recvfrom.c
index 905f14239f9..e259eb62138 100644
--- a/lib/libc_r/uthread/uthread_recvfrom.c
+++ b/lib/libc_r/uthread/uthread_recvfrom.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_recvfrom.c,v 1.2 1999/01/06 05:29:25 d Exp $
+ * $OpenBSD: uthread_recvfrom.c,v 1.3 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
@@ -40,7 +40,8 @@
 #include "pthread_private.h"
 
 ssize_t
-recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr * from, int *from_len)
+recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr * from,
+    socklen_t *from_len)
 {
 	int             ret;
 
diff --git a/lib/libc_r/uthread/uthread_setsockopt.c b/lib/libc_r/uthread/uthread_setsockopt.c
index 6681943db7c..67be1fe195d 100644
--- a/lib/libc_r/uthread/uthread_setsockopt.c
+++ b/lib/libc_r/uthread/uthread_setsockopt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_setsockopt.c,v 1.2 1999/01/06 05:29:27 d Exp $
+ * $OpenBSD: uthread_setsockopt.c,v 1.3 1999/02/16 16:40:01 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-setsockopt(int fd, int level, int optname, const void *optval, int optlen)
+setsockopt(int fd, int level, int optname, const void *optval, socklen_t optlen)
 {
 	int             ret;
 
diff --git a/lib/libpthread/uthread/uthread_accept.c b/lib/libpthread/uthread/uthread_accept.c
index 5a6bd90fe9f..95f8c10b56c 100644
--- a/lib/libpthread/uthread/uthread_accept.c
+++ b/lib/libpthread/uthread/uthread_accept.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_accept.c,v 1.2 1999/01/06 05:29:21 d Exp $
+ * $OpenBSD: uthread_accept.c,v 1.3 1999/02/16 16:39:59 deraadt Exp $
  */
 #include <errno.h>
 #include <unistd.h>
@@ -41,7 +41,7 @@
 #include "pthread_private.h"
 
 int
-accept(int fd, struct sockaddr * name, int *namelen)
+accept(int fd, struct sockaddr * name, socklen_t *namelen)
 {
 	int             ret;
 
diff --git a/lib/libpthread/uthread/uthread_bind.c b/lib/libpthread/uthread/uthread_bind.c
index b638704dff3..644b31a0197 100644
--- a/lib/libpthread/uthread/uthread_bind.c
+++ b/lib/libpthread/uthread/uthread_bind.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_bind.c,v 1.2 1999/01/06 05:29:22 d Exp $
+ * $OpenBSD: uthread_bind.c,v 1.3 1999/02/16 16:39:59 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-bind(int fd, const struct sockaddr * name, int namelen)
+bind(int fd, const struct sockaddr * name, socklen_t namelen)
 {
 	int             ret;
 
diff --git a/lib/libpthread/uthread/uthread_connect.c b/lib/libpthread/uthread/uthread_connect.c
index 37ed517ca4b..59fc0724f47 100644
--- a/lib/libpthread/uthread/uthread_connect.c
+++ b/lib/libpthread/uthread/uthread_connect.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_connect.c,v 1.1 1998/08/27 09:00:58 d Exp $
+ * $OpenBSD: uthread_connect.c,v 1.2 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
@@ -40,10 +40,11 @@
 #include "pthread_private.h"
 
 int
-connect(int fd, const struct sockaddr * name, int namelen)
+connect(int fd, const struct sockaddr * name, socklen_t namelen)
 {
 	struct sockaddr tmpname;
-	int             errnolen, ret, tmpnamelen;
+	int             errnolen, ret;
+	socklen_t	tmpnamelen;
 
 	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
 		if ((ret = _thread_sys_connect(fd, name, namelen)) < 0) {
diff --git a/lib/libpthread/uthread/uthread_getpeername.c b/lib/libpthread/uthread/uthread_getpeername.c
index 73c73e23ab7..adb3ab3587b 100644
--- a/lib/libpthread/uthread/uthread_getpeername.c
+++ b/lib/libpthread/uthread/uthread_getpeername.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_getpeername.c,v 1.2 1999/01/06 05:29:24 d Exp $
+ * $OpenBSD: uthread_getpeername.c,v 1.3 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-getpeername(int fd, struct sockaddr * peer, int *paddrlen)
+getpeername(int fd, struct sockaddr *peer, socklen_t *paddrlen)
 {
 	int             ret;
 
diff --git a/lib/libpthread/uthread/uthread_getsockname.c b/lib/libpthread/uthread/uthread_getsockname.c
index c20e73ae8ce..4ed580dc2cf 100644
--- a/lib/libpthread/uthread/uthread_getsockname.c
+++ b/lib/libpthread/uthread/uthread_getsockname.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_getsockname.c,v 1.2 1999/01/06 05:29:24 d Exp $
+ * $OpenBSD: uthread_getsockname.c,v 1.3 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-getsockname(int s, struct sockaddr * name, int *namelen)
+getsockname(int s, struct sockaddr * name, socklen_t *namelen)
 {
 	int             ret;
 
diff --git a/lib/libpthread/uthread/uthread_getsockopt.c b/lib/libpthread/uthread/uthread_getsockopt.c
index cb1aa034497..7205ac345a3 100644
--- a/lib/libpthread/uthread/uthread_getsockopt.c
+++ b/lib/libpthread/uthread/uthread_getsockopt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_getsockopt.c,v 1.2 1999/01/06 05:29:24 d Exp $
+ * $OpenBSD: uthread_getsockopt.c,v 1.3 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-getsockopt(int fd, int level, int optname, void *optval, int *optlen)
+getsockopt(int fd, int level, int optname, void *optval, socklen_t *optlen)
 {
 	int             ret;
 
diff --git a/lib/libpthread/uthread/uthread_recvfrom.c b/lib/libpthread/uthread/uthread_recvfrom.c
index 905f14239f9..e259eb62138 100644
--- a/lib/libpthread/uthread/uthread_recvfrom.c
+++ b/lib/libpthread/uthread/uthread_recvfrom.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_recvfrom.c,v 1.2 1999/01/06 05:29:25 d Exp $
+ * $OpenBSD: uthread_recvfrom.c,v 1.3 1999/02/16 16:40:00 deraadt Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
@@ -40,7 +40,8 @@
 #include "pthread_private.h"
 
 ssize_t
-recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr * from, int *from_len)
+recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr * from,
+    socklen_t *from_len)
 {
 	int             ret;
 
diff --git a/lib/libpthread/uthread/uthread_setsockopt.c b/lib/libpthread/uthread/uthread_setsockopt.c
index 6681943db7c..67be1fe195d 100644
--- a/lib/libpthread/uthread/uthread_setsockopt.c
+++ b/lib/libpthread/uthread/uthread_setsockopt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: uthread_setsockopt.c,v 1.2 1999/01/06 05:29:27 d Exp $
+ * $OpenBSD: uthread_setsockopt.c,v 1.3 1999/02/16 16:40:01 deraadt Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,7 +38,7 @@
 #include "pthread_private.h"
 
 int
-setsockopt(int fd, int level, int optname, const void *optval, int optlen)
+setsockopt(int fd, int level, int optname, const void *optval, socklen_t optlen)
 {
 	int             ret;