merge with 1.10n4

1 files changed, 20 insertions, 27 deletions

diff --git a/lib/strcspn.c b/lib/strcspn.c
index 3cee66424c..2a8f293ca1 100644
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,43 +1,36 @@
 /* Copyright (C) 1991 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@prep.ai.mit.edu.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+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.
 
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#ifdef HAVE_STRING_H
+#include <ansidecl.h>
 #include <string.h>
-#else
-#include <strings.h>
-#ifndef strchr
-#define strchr index
-#endif
-#endif
+
 
 /* Return the length of the maximum inital segment of S
    which contains no characters from REJECT.  */
-int
-strcspn (s, reject)
-     register char *s;
-     register char *reject;
+size_t
+DEFUN(strcspn, (s, reject),
+      register CONST char *s AND register CONST char *reject)
 {
-  register int count = 0;
+  register size_t count = 0;
 
   while (*s != '\0')
-    if (strchr (reject, *s++) == 0)
+    if (strchr(reject, *s++) == NULL)
       ++count;
     else
       return count;