X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstrnlen1.c;h=b8cd2bff03b187ed607da070a35b7d7e236edb29;hb=6bd173f7ffcd7f02646ad1086035e8ba9cbddcba;hp=9b0032cb2c0c91226c7bc8b0afee8518cab3cf66;hpb=a897449aaae8e6c051f3b9daaf984de5c5e092f3;p=gnulib.git
diff --git a/lib/strnlen1.c b/lib/strnlen1.c
index 9b0032cb2..b8cd2bff0 100644
--- a/lib/strnlen1.c
+++ b/lib/strnlen1.c
@@ -1,10 +1,10 @@
/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,12 +12,9 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
#include "strnlen1.h"
@@ -30,7 +27,7 @@
size_t
strnlen1 (const char *string, size_t maxlen)
{
- const char *end = memchr (string, '\0', maxlen);
+ const char *end = (const char *) memchr (string, '\0', maxlen);
if (end != NULL)
return end - string + 1;
else