summaryrefslogtreecommitdiffstats
path: root/lib/libc/string
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2015-10-01 02:32:07 +0000
committerguenther <guenther@openbsd.org>2015-10-01 02:32:07 +0000
commit9d9553bd2d73b47a1e6c954c7538bf7cd6b06ea5 (patch)
tree022c8bf1714eee5427f8033ca0d81a992629f7aa /lib/libc/string
parentrename the internal functions that do ml_foo ops on classes to hfsc_cl_foo. (diff)
downloadwireguard-openbsd-9d9553bd2d73b47a1e6c954c7538bf7cd6b06ea5.tar.xz
wireguard-openbsd-9d9553bd2d73b47a1e6c954c7538bf7cd6b06ea5.zip
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@
Diffstat (limited to 'lib/libc/string')
-rw-r--r--lib/libc/string/wcschr.c3
-rw-r--r--lib/libc/string/wcspbrk.c3
-rw-r--r--lib/libc/string/wcsrchr.c3
-rw-r--r--lib/libc/string/wcsstr.c4
-rw-r--r--lib/libc/string/wmemchr.c3
5 files changed, 5 insertions, 11 deletions
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++;