X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrcspn.c;h=a807a4909c59934f713f85883f7c8ab9aa1bdfcc;hb=ea6b0b0c5caf18a059bb974a2d0c1739d5be671c;hp=fadf1411a88047208d4c8ef35ebfdc823033677e;hpb=d349992d82f97d614404565ff66e3f8a47b4a568;p=gnulib.git

diff --git a/lib/strcspn.c b/lib/strcspn.c
index fadf1411a..a807a4909 100644
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,11 +1,12 @@
-/* Copyright (C) 1991, 1994, 1996, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006, 2009-2010 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
+   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
+   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,
@@ -14,36 +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.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined _LIBC || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include <stddef.h>
+#include <string.h>
 
 #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)
 {
-  int count = 0;
+  size_t count = 0;
 
   while (*s != '\0')
-    if (strchr (reject, *s++) == 0)
+    if (strchr (reject, *s++) == NULL)
       ++count;
     else
       return count;