diff options
| author | Jim Meyering <jim@meyering.net> | 1997-11-13 14:21:02 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1997-11-13 14:21:02 +0000 |
| commit | f52ec0e772dbe21b4c95dc45ee5a7896ec8dbccc (patch) | |
| tree | 64757104ce6d157c337c8e00149dbcf2e0de4b5d | |
| parent | d29c650718b4b1cb523c68a352429edd309b30bc (diff) | |
| download | coreutils-f52ec0e772dbe21b4c95dc45ee5a7896ec8dbccc.tar.xz | |
partial update from FSF -- use int, not size_t; 0, not NULL
| -rw-r--r-- | lib/strcspn.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/lib/strcspn.c b/lib/strcspn.c index 9a191cd17..a84d4c41d 100644 --- a/lib/strcspn.c +++ b/lib/strcspn.c @@ -1,9 +1,12 @@ /* Copyright (C) 1991, 1994, 1996, 1997 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 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -11,14 +14,15 @@ 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. */ + 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 +#if defined _LIBC || HAVE_STRING_H # include <string.h> #else # include <strings.h> @@ -27,14 +31,16 @@ # endif #endif +#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; + const char *s; + const char *reject; { - register int count = 0; + int count = 0; while (*s != '\0') if (strchr (reject, *s++) == 0) |