From 70b6eb2ef0822917d876bd86a51318fa96fbe26f Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Wed, 11 Jun 2003 21:08:29 +0000 Subject: [PATCH] ansification, pval ok --- src/lib/libc/string/strcoll.c | 5 ++--- 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 d024f724..9622b672 100644 --- a/src/lib/libc/string/strcoll.c +++ b/src/lib/libc/string/strcoll.c @@ -31,7 +31,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strcoll.c,v 1.3 2003/06/02 20:18:38 millert Exp $"; +static char *rcsid = "$OpenBSD: strcoll.c,v 1.4 2003/06/11 21:08:29 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -40,8 +40,7 @@ static char *rcsid = "$OpenBSD: strcoll.c,v 1.3 2003/06/02 20:18:38 millert Exp * Compare strings according to LC_COLLATE category of current locale. */ int -strcoll(s1, s2) - const char *s1, *s2; +strcoll(const char *s1, const char *s2) { /* LC_COLLATE is unimplemented, hence always "C" */ return (strcmp(s1, s2)); diff --git a/src/lib/libc/string/strspn.c b/src/lib/libc/string/strspn.c index 50b7dbb0..d51a8cd3 100644 --- a/src/lib/libc/string/strspn.c +++ b/src/lib/libc/string/strspn.c @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strspn.c,v 1.3 2003/06/02 20:18:38 millert Exp $"; +static char *rcsid = "$OpenBSD: strspn.c,v 1.4 2003/06/11 21:08:29 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -37,12 +37,10 @@ static char *rcsid = "$OpenBSD: strspn.c,v 1.3 2003/06/02 20:18:38 millert Exp $ * Span the string s2 (skip characters that are in s2). */ size_t -strspn(s1, s2) - const char *s1; - register const char *s2; +strspn(const char *s1, const char *s2) { - register const char *p = s1, *spanp; - register char c, sc; + const char *p = s1, *spanp; + char c, sc; /* * Skip any characters in s2, excluding the terminating \0.