Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Before using the slightly more involved bitmap tables, 

check that the charset for strspn/strcspn is non-trivial.
An empty charset is either a direct return or a strlen and
a single charset a simple loop.
This commit is contained in:
joerg 2008-07-30 16:13:59 +00:00
parent a3adeaa5f9
commit 9acf218ba1
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libc/string/strcspn.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: strcspn.c,v 1.15 2008/02/23 15:53:22 christos Exp $ */
/* $NetBSD: strcspn.c,v 1.16 2008/07/30 16:13:59 joerg Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: strcspn.c,v 1.15 2008/02/23 15:53:22 christos Exp $");
__RCSID("$NetBSD: strcspn.c,v 1.16 2008/07/30 16:13:59 joerg Exp $");
#include <assert.h>
#include <inttypes.h>
@ -43,6 +43,15 @@ strcspn(const char *s, const char *charset)
_DIAGASSERT(s != NULL);
_DIAGASSERT(charset != NULL);
if (charset[0] == '\0')
return strlen(s);
if (charset[1] == '\0') {
for (t = s; *t != '\0'; ++t)
if (*t == *charset)
break;
return t - s;
}
(void)memset(set, 0, sizeof(set));
for (; *charset != '\0'; ++charset)

14
lib/libc/string/strspn.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: strspn.c,v 1.15 2008/02/23 15:53:22 christos Exp $ */
/* $NetBSD: strspn.c,v 1.16 2008/07/30 16:13:59 joerg Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: strspn.c,v 1.15 2008/02/23 15:53:22 christos Exp $");
__RCSID("$NetBSD: strspn.c,v 1.16 2008/07/30 16:13:59 joerg Exp $");
#include <assert.h>
#include <inttypes.h>
@ -44,6 +44,16 @@ strspn(const char *s, const char *charset)
_DIAGASSERT(s != NULL);
_DIAGASSERT(charset != NULL);
if (charset[0] == '\0')
return 0;
if (charset[1] == '\0') {
for (t = s; *t != '\0'; ++t) {
if (*t != *charset)
break;
}
return t - s;
}
(void)memset(set, 0, sizeof(set));
for (; *charset != '\0'; ++charset)