summaryrefslogtreecommitdiff
path: root/lib/strcspn.c
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2002-11-15 17:36:03 +0000
committerBruno Haible <bruno@clisp.org>2002-11-15 17:36:03 +0000
commitb51fcc0b038ac4d720d7d34ad98d78a14824e444 (patch)
tree99d4f43f1bf4b9d1c8f59b0c9687ff775fe405c8 /lib/strcspn.c
parentd79ef04766e844e5eb34513366b2e3be842db6ee (diff)
downloadgnulib-b51fcc0b038ac4d720d7d34ad98d78a14824e444.tar.gz
Minimize diffs to glibc. Modernize.
Diffstat (limited to 'lib/strcspn.c')
-rw-r--r--lib/strcspn.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/strcspn.c b/lib/strcspn.c
index a84d4c41d1..2bbd906643 100644
--- 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 Free Software Foundation, Inc.
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
@@ -22,6 +22,8 @@
# include <config.h>
#endif
+#include <stddef.h>
+
#if defined _LIBC || HAVE_STRING_H
# include <string.h>
#else
@@ -35,15 +37,13 @@
/* 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)
{
- int count = 0;
+ size_t count = 0;
while (*s != '\0')
- if (strchr (reject, *s++) == 0)
+ if (strchr (reject, *s++) == NULL)
++count;
else
return count;