From: Jim Meyering <jim@meyering.net>
Date: Thu, 21 Nov 2002 13:25:22 +0000 (+0000)
Subject: Update from gnulib.
X-Git-Tag: v4.5.4~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8a8d77816ab927b6c1ec9c6519e16d6ed5a715a;p=thirdparty%2Fcoreutils.git

Update from gnulib.
---

diff --git a/lib/strcspn.c b/lib/strcspn.c
index a84d4c41d1..2bbd906643 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 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
@@ -22,6 +22,8 @@
 # include <config.h>
 #endif
 
+#include <stddef.h>
+
 #if defined _LIBC || HAVE_STRING_H
 # include <string.h>
 #else
@@ -35,15 +37,13 @@
 
 /* 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;