projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regcomp.c: sync white-space changes from glibc
[gnulib.git]
/
lib
/
strnlen1.c
diff --git
a/lib/strnlen1.c
b/lib/strnlen1.c
index
9b0032c
..
b8cd2bf
100644
(file)
--- a/
lib/strnlen1.c
+++ b/
lib/strnlen1.c
@@
-1,10
+1,10
@@
/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
/* 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
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
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
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 <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "strnlen1.h"
/* Specification. */
#include "strnlen1.h"
@@
-30,7
+27,7
@@
size_t
strnlen1 (const char *string, size_t maxlen)
{
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
if (end != NULL)
return end - string + 1;
else