Browse Source

ansification, pval ok

OPENBSD_3_4
deraadt 21 years ago
parent
commit
70b6eb2ef0
2 changed files with 6 additions and 9 deletions
  1. +2
    -3
      src/lib/libc/string/strcoll.c
  2. +4
    -6
      src/lib/libc/string/strspn.c

+ 2
- 3
src/lib/libc/string/strcoll.c View File

@ -31,7 +31,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #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 */ #endif /* LIBC_SCCS and not lint */
#include <string.h> #include <string.h>
@ -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. * Compare strings according to LC_COLLATE category of current locale.
*/ */
int int
strcoll(s1, s2)
const char *s1, *s2;
strcoll(const char *s1, const char *s2)
{ {
/* LC_COLLATE is unimplemented, hence always "C" */ /* LC_COLLATE is unimplemented, hence always "C" */
return (strcmp(s1, s2)); return (strcmp(s1, s2));


+ 4
- 6
src/lib/libc/string/strspn.c View File

@ -28,7 +28,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #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 */ #endif /* LIBC_SCCS and not lint */
#include <string.h> #include <string.h>
@ -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). * Span the string s2 (skip characters that are in s2).
*/ */
size_t 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. * Skip any characters in s2, excluding the terminating \0.


Loading…
Cancel
Save