Eliminate the last of the LINTEDn and PRINTFLIKEn comments. In one

case, by deleting some useless '& of an array' we also eliminate the need
for the casts which prompted the original lint warnings

ok deraadt@

14 files changed, 19 insertions, 44 deletions

diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
index 96a80e17482..cf179fd7898 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setproctitle.c,v 1.13 2015/01/16 16:48:51 deraadt Exp $ */
+/*	$OpenBSD: setproctitle.c,v 1.14 2015/10/01 02:32:07 guenther Exp $ */
 /*
  * Copyright (c) 1994, 1995 Christopher G. Demetriou
  * All rights reserved.
@@ -43,7 +43,6 @@
 
 extern char *__progname;		/* Program name, from crt0. */
 
-/* PRINTFLIKE1 */
 void
 setproctitle(const char *fmt, ...)
 {
diff --git a/lib/libc/locale/_wcstod.h b/lib/libc/locale/_wcstod.h
index de9de77e086..27f375f1589 100644
--- a/lib/libc/locale/_wcstod.h
+++ b/lib/libc/locale/_wcstod.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _wcstod.h,v 1.3 2015/09/12 16:23:14 guenther Exp $	*/
+/*	$OpenBSD: _wcstod.h,v 1.4 2015/10/01 02:32:07 guenther Exp $	*/
 /* $NetBSD: wcstod.c,v 1.4 2001/10/28 12:08:43 yamt Exp $ */
 
 /*-
@@ -134,8 +134,6 @@ match:
 			const char *s = buf;
 			memset(&st, 0, sizeof(st));
 			size = mbsnrtowcs(NULL, &s, end - buf, 0, &st);
-
-			/* LINTED bad interface */
 			*endptr = (wchar_t*)start + size;
 		}
 
@@ -146,7 +144,6 @@ match:
 
 fail:
 	if (endptr)
-		/* LINTED bad interface */
 		*endptr = (wchar_t*)nptr;
 
 	return 0;
diff --git a/lib/libc/locale/_wcstol.h b/lib/libc/locale/_wcstol.h
index e105b0100ff..1b60a3a4532 100644
--- a/lib/libc/locale/_wcstol.h
+++ b/lib/libc/locale/_wcstol.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _wcstol.h,v 1.2 2015/09/12 16:23:14 guenther Exp $	*/
+/*	$OpenBSD: _wcstol.h,v 1.3 2015/10/01 02:32:07 guenther Exp $	*/
 /* $NetBSD: _wcstol.h,v 1.2 2003/08/07 16:43:03 agc Exp $ */
 
 /*-
@@ -130,7 +130,6 @@ FUNCNAME(const wchar_t *nptr, wchar_t **endptr, int base)
 		}
 	}
 	if (endptr != 0)
-		/* LINTED interface specification */
 		*endptr = (wchar_t *)(any ? s - 1 : nptr);
 	return (acc);
 }
diff --git a/lib/libc/locale/_wcstoul.h b/lib/libc/locale/_wcstoul.h
index c42442295d5..159b22b2945 100644
--- a/lib/libc/locale/_wcstoul.h
+++ b/lib/libc/locale/_wcstoul.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _wcstoul.h,v 1.2 2015/09/12 16:23:14 guenther Exp $	*/
+/*	$OpenBSD: _wcstoul.h,v 1.3 2015/10/01 02:32:07 guenther Exp $	*/
 /* $NetBSD: _wcstoul.h,v 1.2 2003/08/07 16:43:03 agc Exp $ */
 
 /*
@@ -110,7 +110,6 @@ FUNCNAME(const wchar_t *nptr, wchar_t **endptr, int base)
 	if (neg && any > 0)
 		acc = -acc;
 	if (endptr != 0)
-		/* LINTED interface specification */
 		*endptr = (wchar_t *)(any ? s - 1 : nptr);
 	return (acc);
 }
diff --git a/lib/libc/locale/runeglue.c b/lib/libc/locale/runeglue.c
index 5ce28100952..33e3a2bc523 100644
--- a/lib/libc/locale/runeglue.c
+++ b/lib/libc/locale/runeglue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: runeglue.c,v 1.3 2012/12/05 23:20:00 deraadt Exp $ */
+/*	$OpenBSD: runeglue.c,v 1.4 2015/10/01 02:32:07 guenther Exp $ */
 /*	$NetBSD: runeglue.c,v 1.10 2003/03/10 21:18:49 tshiozak Exp $	*/
 
 /*-
@@ -117,15 +117,9 @@ void
 __install_currentrunelocale_ctype()
 {
 	if (_CurrentRuneLocale->rl_tabs != NULL) {
-		/* LINTED const cast */
-		_ctype_ = (const unsigned char *)
-		    &(_CurrentRuneLocale->rl_tabs->ctype_tab);
-		/* LINTED const cast */
-		_toupper_tab_ = (const short *)
-		    &(_CurrentRuneLocale->rl_tabs->toupper_tab);
-		/* LINTED const cast */
-		_tolower_tab_ = (const short *)
-		    &(_CurrentRuneLocale->rl_tabs->tolower_tab);
+		_ctype_       = _CurrentRuneLocale->rl_tabs->ctype_tab;
+		_toupper_tab_ = _CurrentRuneLocale->rl_tabs->toupper_tab;
+		_tolower_tab_ = _CurrentRuneLocale->rl_tabs->tolower_tab;
 	} else {
 		_ctype_ = _C_ctype_;
 		_toupper_tab_ = _C_toupper_;
diff --git a/lib/libc/quad/ashrdi3.c b/lib/libc/quad/ashrdi3.c
index d99643bac5e..990f6773db0 100644
--- a/lib/libc/quad/ashrdi3.c
+++ b/lib/libc/quad/ashrdi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ashrdi3.c,v 1.6 2005/08/08 08:05:35 espie Exp $ */
+/*	$OpenBSD: ashrdi3.c,v 1.7 2015/10/01 02:32:07 guenther Exp $ */
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -55,15 +55,12 @@ __ashrdi3(quad_t a, qshift_t shift)
 		 * INT_BITS is undefined, so we shift (INT_BITS-1),
 		 * then 1 more, to get our answer.
 		 */
-		/* LINTED inherits machine dependency */
 		s = (aa.sl[H] >> (INT_BITS - 1)) >> 1;
-		/* LINTED inherits machine dependency*/
 		aa.ul[L] = aa.sl[H] >> (shift - INT_BITS);
 		aa.ul[H] = s;
 	} else {
 		aa.ul[L] = (aa.ul[L] >> shift) |
 		    (aa.ul[H] << (INT_BITS - shift));
-		/* LINTED inherits machine dependency */
 		aa.sl[H] >>= shift;
 	}
 	return (aa.q);
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c
index fa3f3704445..829c22c48dd 100644
--- a/lib/libc/stdio/fputwc.c
+++ b/lib/libc/stdio/fputwc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fputwc.c,v 1.5 2015/08/31 02:53:57 guenther Exp $	*/
+/*	$OpenBSD: fputwc.c,v 1.6 2015/10/01 02:32:07 guenther Exp $	*/
 /* $NetBSD: fputwc.c,v 1.3 2003/03/07 07:11:37 tshiozak Exp $ */
 
 /*-
@@ -46,8 +46,7 @@ __fputwc_unlock(wchar_t wc, FILE *fp)
 	struct __suio uio;
 	struct __siov iov;
 
-	/* LINTED we don't play with buf */
-	iov.iov_base = (void *)buf;
+	iov.iov_base = buf;
 	uio.uio_iov = &iov;
 	uio.uio_iovcnt = 1;
 
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index 0ca6b055bad..51ddf95f947 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sprintf.c,v 1.17 2011/05/30 18:48:33 martynas Exp $ */
+/*	$OpenBSD: sprintf.c,v 1.18 2015/10/01 02:32:07 guenther Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +42,6 @@ __warn_references(sprintf,
     "warning: sprintf() is often misused, please use snprintf()");
 #endif
 
-/* PRINTFLIKE2 */
 int
 sprintf(char *str, const char *fmt, ...)
 {
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index fe4565526ac..eb799c31f59 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getopt_long.c,v 1.28 2015/09/19 04:02:21 guenther Exp $	*/
+/*	$OpenBSD: getopt_long.c,v 1.29 2015/10/01 02:32:07 guenther Exp $	*/
 /*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
 
 /*
@@ -149,9 +149,7 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end,
 			else
 				pos += nopts;
 			swap = nargv[pos];
-			/* LINTED const cast */
-			((char **) nargv)[pos] = nargv[cstart];
-			/* LINTED const cast */
+			((char **)nargv)[pos] = nargv[cstart];
 			((char **)nargv)[cstart] = swap;
 		}
 	}
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index 231c7605a29..709d4797bbc 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wcschr.c,v 1.5 2015/09/12 16:23:14 guenther Exp $	*/
+/*	$OpenBSD: wcschr.c,v 1.6 2015/10/01 02:32:07 guenther Exp $	*/
 /*	$NetBSD: wcschr.c,v 1.2 2001/01/03 14:29:36 lukem Exp $	*/
 
 /*-
@@ -39,7 +39,6 @@ wcschr(const wchar_t *s, wchar_t c)
 	p = s;
 	for (;;) {
 		if (*p == c) {
-			/* LINTED interface specification */
 			return (wchar_t *)p;
 		}
 		if (!*p)
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
index 2178dc40673..f398fd92abb 100644
--- a/lib/libc/string/wcspbrk.c
+++ b/lib/libc/string/wcspbrk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wcspbrk.c,v 1.4 2015/09/12 16:23:14 guenther Exp $	*/
+/*	$OpenBSD: wcspbrk.c,v 1.5 2015/10/01 02:32:07 guenther Exp $	*/
 /*	$NetBSD: wcspbrk.c,v 1.2 2001/01/03 14:29:37 lukem Exp $	*/
 
 /*-
@@ -42,7 +42,6 @@ wcspbrk(const wchar_t *s, const wchar_t *set)
 		q = set;
 		while (*q) {
 			if (*p == *q) {
-				/* LINTED interface specification */
 				return (wchar_t *)p;
 			}
 			q++;
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index b69bdac1c92..aa936de508d 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wcsrchr.c,v 1.4 2015/09/12 16:23:14 guenther Exp $	*/
+/*	$OpenBSD: wcsrchr.c,v 1.5 2015/10/01 02:32:07 guenther Exp $	*/
 /*	$NetBSD: wcsrchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,6 @@ wcsrchr(const wchar_t *s, wchar_t c)
 		p++;
 	while (s <= p) {
 		if (*p == c) {
-			/* LINTED interface specification */
 			return (wchar_t *)p;
 		}
 		p--;
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index 6a08b625515..6a7b0dac4ac 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wcsstr.c,v 1.4 2015/09/12 16:23:14 guenther Exp $	*/
+/*	$OpenBSD: wcsstr.c,v 1.5 2015/10/01 02:32:07 guenther Exp $	*/
 /*	$NetBSD: wcsstr.c,v 1.3 2003/03/05 20:18:17 tshiozak Exp $	*/
 
 /*-
@@ -43,7 +43,6 @@ wcsstr(const wchar_t *big, const wchar_t *little)
 	const wchar_t *r;
 
 	if (!*little) {
-		/* LINTED interface specification */
 		return (wchar_t *)big;
 	}
 	if (wcslen(big) < wcslen(little))
@@ -61,7 +60,6 @@ wcsstr(const wchar_t *big, const wchar_t *little)
 			r++;
 		}
 		if (!*q) {
-			/* LINTED interface specification */
 			return (wchar_t *)p;
 		}
 		p++;
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
index 55fb76a5e69..556a0b35ccc 100644
--- a/lib/libc/string/wmemchr.c
+++ b/lib/libc/string/wmemchr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wmemchr.c,v 1.4 2015/09/12 16:23:14 guenther Exp $	*/
+/*	$OpenBSD: wmemchr.c,v 1.5 2015/10/01 02:32:07 guenther Exp $	*/
 /*	$NetBSD: wmemchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $	*/
 
 /*-
@@ -38,7 +38,6 @@ wmemchr(const wchar_t *s, wchar_t c, size_t n)
 
 	for (i = 0; i < n; i++) {
 		if (*s == c) {
-			/* LINTED const castaway */
 			return (wchar_t *)s;
 		}
 		s++;