diff options
Diffstat (limited to 'lib/strnlen1.c')
| -rw-r--r-- | lib/strnlen1.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/lib/strnlen1.c b/lib/strnlen1.c index f3338e7..422ed9e 100644 --- a/lib/strnlen1.c +++ b/lib/strnlen1.c @@ -1,24 +1,21 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005-2006 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU Library 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. */ + 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. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #include "strnlen1.h" @@ -31,7 +28,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 |