X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrcspn.c;h=0eecb8dc15baa9a6b699f72170d1b01ec52ca68b;hb=59547ffe21fdc59d39fa6f5c6d173cb04eaee67c;hp=9a191cd17211a1efe9a7f0d2bfaabc55923f6d04;hpb=5b212401037d18c1843af1b13c8cfe7f2b0756dc;p=gnulib.git

diff --git a/lib/strcspn.c b/lib/strcspn.c
index 9a191cd17..0eecb8dc1 100644
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,9 +1,12 @@
-/* Copyright (C) 1991, 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006 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 +14,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 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)
-     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;