X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrcspn.c;h=9fbc5de491afc87f911f2f6a36ebd123cade8ce9;hb=8de557e31178699dd6e839850056f0653cdfba89;hp=a84d4c41d17b012e13c540c8460eee86200bfa29;hpb=89f2b4892655a929a506eff123c9126a88e2c8eb;p=gnulib.git

diff --git a/lib/strcspn.c b/lib/strcspn.c
index a84d4c41d..9fbc5de49 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-2003 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
@@ -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
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef 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
+#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;