projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify my *-tests modules.
[gnulib.git]
/
lib
/
strcspn.c
diff --git
a/lib/strcspn.c
b/lib/strcspn.c
index
a84d4c4
..
9fbc5de
100644
(file)
--- a/
lib/strcspn.c
+++ b/
lib/strcspn.c
@@
-1,7
+1,7
@@
-/* Copyright (C) 1991, 1994, 1996
, 1997
Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996
-1997, 2002-2003
Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
NOTE: The canonical source of this file is maintained with the GNU C Library.
- Bugs can be reported to bug-glibc@
prep.ai.mit.edu
.
+ Bugs can be reported to bug-glibc@
gnu.org
.
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
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
@@
-15,35
+15,27
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
,
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
,
USA. */
USA. */
-#if HAVE_CONFIG_H
+#if
def
HAVE_CONFIG_H
# include <config.h>
#endif
# include <config.h>
#endif
-#if defined _LIBC || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-# define strchr index
-# endif
-#endif
+#include <stddef.h>
+#include <string.h>
#undef strcspn
/* Return the length of the maximum initial segment of S
which contains no characters from REJECT. */
#undef strcspn
/* Return the length of the maximum initial segment of S
which contains no characters from REJECT. */
-int
-strcspn (s, reject)
- const char *s;
- const char *reject;
+size_t
+strcspn (const char *s, const char *reject)
{
{
-
in
t count = 0;
+
size_
t count = 0;
while (*s != '\0')
while (*s != '\0')
- if (strchr (reject, *s++) ==
0
)
+ if (strchr (reject, *s++) ==
NULL
)
++count;
else
return count;
++count;
else
return count;