diff options
author | deraadt <> | 2003-06-11 21:08:29 +0000 |
---|---|---|
committer | deraadt <> | 2003-06-11 21:08:29 +0000 |
commit | 9a5e83348f89c3495c3483afb234c04d58b1e58e (patch) | |
tree | ebbd0bacb3fa3a05d089ac224b8e725131844537 | |
parent | 05ebc6b11cf74e0e9e901f2e1c26d0d682c57842 (diff) | |
download | openbsd-9a5e83348f89c3495c3483afb234c04d58b1e58e.tar.gz openbsd-9a5e83348f89c3495c3483afb234c04d58b1e58e.tar.bz2 openbsd-9a5e83348f89c3495c3483afb234c04d58b1e58e.zip |
ansification, pval ok
-rw-r--r-- | src/lib/libc/string/strcoll.c | 5 | ||||
-rw-r--r-- | src/lib/libc/string/strspn.c | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/libc/string/strcoll.c b/src/lib/libc/string/strcoll.c index d024f72444..9622b67281 100644 --- a/src/lib/libc/string/strcoll.c +++ b/src/lib/libc/string/strcoll.c | |||
@@ -31,7 +31,7 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | #if defined(LIBC_SCCS) && !defined(lint) | 33 | #if defined(LIBC_SCCS) && !defined(lint) |
34 | static char *rcsid = "$OpenBSD: strcoll.c,v 1.3 2003/06/02 20:18:38 millert Exp $"; | 34 | static char *rcsid = "$OpenBSD: strcoll.c,v 1.4 2003/06/11 21:08:29 deraadt Exp $"; |
35 | #endif /* LIBC_SCCS and not lint */ | 35 | #endif /* LIBC_SCCS and not lint */ |
36 | 36 | ||
37 | #include <string.h> | 37 | #include <string.h> |
@@ -40,8 +40,7 @@ static char *rcsid = "$OpenBSD: strcoll.c,v 1.3 2003/06/02 20:18:38 millert Exp | |||
40 | * Compare strings according to LC_COLLATE category of current locale. | 40 | * Compare strings according to LC_COLLATE category of current locale. |
41 | */ | 41 | */ |
42 | int | 42 | int |
43 | strcoll(s1, s2) | 43 | strcoll(const char *s1, const char *s2) |
44 | const char *s1, *s2; | ||
45 | { | 44 | { |
46 | /* LC_COLLATE is unimplemented, hence always "C" */ | 45 | /* LC_COLLATE is unimplemented, hence always "C" */ |
47 | return (strcmp(s1, s2)); | 46 | return (strcmp(s1, s2)); |
diff --git a/src/lib/libc/string/strspn.c b/src/lib/libc/string/strspn.c index 50b7dbb095..d51a8cd3e6 100644 --- a/src/lib/libc/string/strspn.c +++ b/src/lib/libc/string/strspn.c | |||
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #if defined(LIBC_SCCS) && !defined(lint) | 30 | #if defined(LIBC_SCCS) && !defined(lint) |
31 | static char *rcsid = "$OpenBSD: strspn.c,v 1.3 2003/06/02 20:18:38 millert Exp $"; | 31 | static char *rcsid = "$OpenBSD: strspn.c,v 1.4 2003/06/11 21:08:29 deraadt Exp $"; |
32 | #endif /* LIBC_SCCS and not lint */ | 32 | #endif /* LIBC_SCCS and not lint */ |
33 | 33 | ||
34 | #include <string.h> | 34 | #include <string.h> |
@@ -37,12 +37,10 @@ static char *rcsid = "$OpenBSD: strspn.c,v 1.3 2003/06/02 20:18:38 millert Exp $ | |||
37 | * Span the string s2 (skip characters that are in s2). | 37 | * Span the string s2 (skip characters that are in s2). |
38 | */ | 38 | */ |
39 | size_t | 39 | size_t |
40 | strspn(s1, s2) | 40 | strspn(const char *s1, const char *s2) |
41 | const char *s1; | ||
42 | register const char *s2; | ||
43 | { | 41 | { |
44 | register const char *p = s1, *spanp; | 42 | const char *p = s1, *spanp; |
45 | register char c, sc; | 43 | char c, sc; |
46 | 44 | ||
47 | /* | 45 | /* |
48 | * Skip any characters in s2, excluding the terminating \0. | 46 | * Skip any characters in s2, excluding the terminating \0. |