lint warning corrections:

- use the correct types
- mark _thread_gc() w/ARGSUSED
- fix a 'a cast does not yield an lvalue'
okay marc@

8 files changed, 17 insertions, 15 deletions

diff --git a/lib/libpthread/uthread/uthread_connect.c b/lib/libpthread/uthread/uthread_connect.c
index 70dfd8ef430..1e4937d48bf 100644
--- a/lib/libpthread/uthread/uthread_connect.c
+++ b/lib/libpthread/uthread/uthread_connect.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_connect.c,v 1.7 2006/10/03 02:59:36 kurt Exp $	*/
+/*	$OpenBSD: uthread_connect.c,v 1.8 2007/05/01 18:16:37 kurt Exp $	*/
 /*
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
  * All rights reserved.
@@ -45,7 +45,8 @@ connect(int fd, const struct sockaddr * name, socklen_t namelen)
 {
 	struct pthread	*curthread = _get_curthread();
 	struct sockaddr tmpname;
-	int             errnolen, ret, tmpnamelen;
+	socklen_t	errnolen, tmpnamelen;
+	int             ret;
 
 	/* This is a cancellation point: */
 	_thread_enter_cancellation_point();
diff --git a/lib/libpthread/uthread/uthread_gc.c b/lib/libpthread/uthread/uthread_gc.c
index 6e527de2873..8dd1098654c 100644
--- a/lib/libpthread/uthread/uthread_gc.c
+++ b/lib/libpthread/uthread/uthread_gc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_gc.c,v 1.16 2006/04/09 02:57:41 krw Exp $	*/
+/*	$OpenBSD: uthread_gc.c,v 1.17 2007/05/01 18:16:37 kurt Exp $	*/
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
  * All rights reserved.
@@ -45,6 +45,7 @@
 #include <pthread.h>
 #include "pthread_private.h"
 
+/* ARGSUSED */
 pthread_addr_t
 _thread_gc(pthread_addr_t arg)
 {
diff --git a/lib/libpthread/uthread/uthread_info_openbsd.c b/lib/libpthread/uthread/uthread_info_openbsd.c
index 1bd94f55d36..5353fe4fc05 100644
--- a/lib/libpthread/uthread/uthread_info_openbsd.c
+++ b/lib/libpthread/uthread/uthread_info_openbsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_info_openbsd.c,v 1.12 2007/04/27 12:59:24 kurt Exp $	*/
+/*	$OpenBSD: uthread_info_openbsd.c,v 1.13 2007/05/01 18:16:37 kurt Exp $	*/
 
 /*
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
@@ -439,7 +439,7 @@ _thread_dump_data(const void *addr, int len)
 				len = 0;
 				memset(data, ' ', DUMP_BUFLEN);
 			}
-			(char *) addr += 8;
+			addr = (char *)addr + 8;
 
 			snprintf(data, DUMP_BUFLEN, "%18p:   ", d);
 			while (count--) {
diff --git a/lib/libpthread/uthread/uthread_mutex.c b/lib/libpthread/uthread/uthread_mutex.c
index 362ba9cc13d..a237d193070 100644
--- a/lib/libpthread/uthread/uthread_mutex.c
+++ b/lib/libpthread/uthread/uthread_mutex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_mutex.c,v 1.19 2007/04/27 19:40:08 kurt Exp $	*/
+/*	$OpenBSD: uthread_mutex.c,v 1.20 2007/05/01 18:16:38 kurt Exp $	*/
 /*
  * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
@@ -114,7 +114,7 @@ pthread_mutex_init(pthread_mutex_t * mutex,
 	enum pthread_mutextype	type = 0;
 	int		protocol = 0;
 	int		ceiling = 0;
-	int		flags = 0;
+	long		flags = 0;
 	int		ret = 0;
 
 	if (mutex == NULL)
diff --git a/lib/libpthread/uthread/uthread_recvfrom.c b/lib/libpthread/uthread/uthread_recvfrom.c
index 21ff7e3f6a5..f27e6e2397a 100644
--- a/lib/libpthread/uthread/uthread_recvfrom.c
+++ b/lib/libpthread/uthread/uthread_recvfrom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_recvfrom.c,v 1.8 2006/10/03 02:59:36 kurt Exp $	*/
+/*	$OpenBSD: uthread_recvfrom.c,v 1.9 2007/05/01 18:16:38 kurt Exp $	*/
 /*
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
  * All rights reserved.
@@ -44,7 +44,7 @@ ssize_t
 recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr * from, socklen_t *from_len)
 {
 	struct pthread	*curthread = _get_curthread();
-	int             ret;
+	ssize_t		ret;
 
 	/* This is a cancellation point: */
 	_thread_enter_cancellation_point();
diff --git a/lib/libpthread/uthread/uthread_recvmsg.c b/lib/libpthread/uthread/uthread_recvmsg.c
index fa455395938..2bde8ee06d9 100644
--- a/lib/libpthread/uthread/uthread_recvmsg.c
+++ b/lib/libpthread/uthread/uthread_recvmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_recvmsg.c,v 1.7 2006/10/03 02:59:36 kurt Exp $	*/
+/*	$OpenBSD: uthread_recvmsg.c,v 1.8 2007/05/01 18:16:38 kurt Exp $	*/
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
  * All rights reserved.
@@ -44,7 +44,7 @@ ssize_t
 recvmsg(int fd, struct msghdr *msg, int flags)
 {
 	struct pthread	*curthread = _get_curthread();
-	int             ret;
+	ssize_t		ret;
 
 	/* This is a cancellation point: */
 	_thread_enter_cancellation_point();
diff --git a/lib/libpthread/uthread/uthread_sendmsg.c b/lib/libpthread/uthread/uthread_sendmsg.c
index 2995af1e024..8272ac91024 100644
--- a/lib/libpthread/uthread/uthread_sendmsg.c
+++ b/lib/libpthread/uthread/uthread_sendmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_sendmsg.c,v 1.7 2006/10/03 02:59:36 kurt Exp $	*/
+/*	$OpenBSD: uthread_sendmsg.c,v 1.8 2007/05/01 18:16:38 kurt Exp $	*/
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
  * All rights reserved.
@@ -44,7 +44,7 @@ ssize_t
 sendmsg(int fd, const struct msghdr *msg, int flags)
 {
 	struct pthread	*curthread = _get_curthread();
-	int             ret;
+	ssize_t		ret;
 
 	/* This is a cancellation point: */
 	_thread_enter_cancellation_point();
diff --git a/lib/libpthread/uthread/uthread_sendto.c b/lib/libpthread/uthread/uthread_sendto.c
index 09b1644d659..a3eddc197f8 100644
--- a/lib/libpthread/uthread/uthread_sendto.c
+++ b/lib/libpthread/uthread/uthread_sendto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_sendto.c,v 1.8 2006/10/03 02:59:36 kurt Exp $	*/
+/*	$OpenBSD: uthread_sendto.c,v 1.9 2007/05/01 18:16:38 kurt Exp $	*/
 /*
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
  * All rights reserved.
@@ -44,7 +44,7 @@ ssize_t
 sendto(int fd, const void *msg, size_t len, int flags, const struct sockaddr * to, socklen_t to_len)
 {
 	struct pthread	*curthread = _get_curthread();
-	int             ret;
+	ssize_t		ret;
 
 	/* This is a cancellation point: */
 	_thread_enter_cancellation_point();