diff options
Diffstat (limited to 'src/lib/libc/string/strcspn.c')
-rw-r--r-- | src/lib/libc/string/strcspn.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/lib/libc/string/strcspn.c b/src/lib/libc/string/strcspn.c index acb4d2a3af..f96f903809 100644 --- a/src/lib/libc/string/strcspn.c +++ b/src/lib/libc/string/strcspn.c | |||
@@ -13,11 +13,7 @@ | |||
13 | * 2. Redistributions in binary form must reproduce the above copyright | 13 | * 2. Redistributions in binary form must reproduce the above copyright |
14 | * notice, this list of conditions and the following disclaimer in the | 14 | * notice, this list of conditions and the following disclaimer in the |
15 | * documentation and/or other materials provided with the distribution. | 15 | * documentation and/or other materials provided with the distribution. |
16 | * 3. All advertising materials mentioning features or use of this software | 16 | * 3. Neither the name of the University nor the names of its contributors |
17 | * must display the following acknowledgement: | ||
18 | * This product includes software developed by the University of | ||
19 | * California, Berkeley and its contributors. | ||
20 | * 4. Neither the name of the University nor the names of its contributors | ||
21 | * may be used to endorse or promote products derived from this software | 17 | * may be used to endorse or promote products derived from this software |
22 | * without specific prior written permission. | 18 | * without specific prior written permission. |
23 | * | 19 | * |
@@ -35,8 +31,7 @@ | |||
35 | */ | 31 | */ |
36 | 32 | ||
37 | #if defined(LIBC_SCCS) && !defined(lint) | 33 | #if defined(LIBC_SCCS) && !defined(lint) |
38 | /*static char *sccsid = "from: @(#)strcspn.c 5.6 (Berkeley) 1/26/91";*/ | 34 | static char *rcsid = "$OpenBSD: strcspn.c,v 1.4 2003/06/11 21:08:16 deraadt Exp $"; |
39 | static char *rcsid = "$Id: strcspn.c,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $"; | ||
40 | #endif /* LIBC_SCCS and not lint */ | 35 | #endif /* LIBC_SCCS and not lint */ |
41 | 36 | ||
42 | #include <string.h> | 37 | #include <string.h> |
@@ -45,12 +40,10 @@ static char *rcsid = "$Id: strcspn.c,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $ | |||
45 | * Span the complement of string s2. | 40 | * Span the complement of string s2. |
46 | */ | 41 | */ |
47 | size_t | 42 | size_t |
48 | strcspn(s1, s2) | 43 | strcspn(const char *s1, const char *s2) |
49 | const char *s1; | ||
50 | register const char *s2; | ||
51 | { | 44 | { |
52 | register const char *p, *spanp; | 45 | const char *p, *spanp; |
53 | register char c, sc; | 46 | char c, sc; |
54 | 47 | ||
55 | /* | 48 | /* |
56 | * Stop as soon as we find any character from s2. Note that there | 49 | * Stop as soon as we find any character from s2. Note that there |