aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--string/bits/string2.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e32d47e18a..53c58d9fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2000-02-18 Ulrich Drepper <drepper@redhat.com>
+ * string/bits/string2.h (strnlen): Add cast to prevent warning.
+
* nscd/connections.c (handle_request): Don't abort() if unknown
command is sent.
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 9d31e16163..f8c32e3248 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -1025,7 +1025,7 @@ __STRING_INLINE size_t
strnlen (__const char *__string, size_t __maxlen)
{
__const char *__end = (__const char *) memchr (__string, '\0', __maxlen);
- return __end ? __end - __string : __maxlen;
+ return __end ? (size_t) (__end - __string) : __maxlen;
}
# endif
#endif