X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrcspn.c;h=e4d780ef05d0b980a01e5a74c3b283d518fac718;hb=fac94349f25305566277d15b965fa8f4efe66613;hp=d174330d9ce5158ed39d66d67965c3b39656fae8;hpb=5d08444ebcbd08cd195e1d9f52937a862c92efaa;p=gnulib.git
diff --git a/lib/strcspn.c b/lib/strcspn.c
index d174330d9..e4d780ef0 100644
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,9 +1,13 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006, 2009-2011 Free
+ * Software Foundation, Inc.
- 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.
+ NOTE: The canonical source of this file is maintained with the GNU C Library.
+ 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
+ Free Software Foundation; either version 3 of the License, or 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
@@ -11,33 +15,24 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
-#ifdef HAVE_CONFIG_H
#include
-#endif
-#ifdef HAVE_STRING_H
+#include
#include
-#else
-#include
-#ifndef strchr
-#define strchr index
-#endif
-#endif
-
-/* Return the length of the maximum inital segment of S
+
+#undef strcspn
+
+/* Return the length of the maximum initial segment of S
which contains no characters from REJECT. */
-int
-strcspn (s, reject)
- register char *s;
- register char *reject;
+size_t
+strcspn (const char *s, const char *reject)
{
- register int count = 0;
+ size_t count = 0;
while (*s != '\0')
- if (strchr (reject, *s++) == 0)
+ if (strchr (reject, *s++) == NULL)
++count;
else
return count;