p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/string.c: simplify str[c]spn 

Use strchr(), which makes them a lot shorter, and more obviously symmetric
in their treatment of accept/reject.  It also saves a little bit of .text;
bloat-o-meter for an arm build says

Function                                     old     new   delta
strcspn                                       92      76     -16
strspn                                       108      76     -32

While here, also remove a stray empty line before EXPORT_SYMBOL().

Link: https://lkml.kernel.org/r/20220328224119.3003834-2-linux@rasmusvillemoes.dk
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Rasmus Villemoes 2022-04-29 14:38:01 -07:00 committed by akpm
parent e0fa2ab3fc
commit dffad91b06
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/string.c
View File

@ -517,21 +517,13 @@ EXPORT_SYMBOL(strnlen);
size_t strspn(const char *s, const char *accept) size_t strspn(const char *s, const char *accept)
{ {
const char *p; const char *p;
const char *a;
size_t count = 0;
for (p = s; *p != '\0'; ++p) { for (p = s; *p != '\0'; ++p) {
for (a = accept; *a != '\0'; ++a) { if (!strchr(accept, *p))
if (*p == *a) break;
break;
}
if (*a == '\0')
return count;
++count;
} }
return count; return p - s;
} }
EXPORT_SYMBOL(strspn); EXPORT_SYMBOL(strspn);
#endif #endif
@ -544,17 +536,12 @@ EXPORT_SYMBOL(strspn);
size_t strcspn(const char *s, const char *reject) size_t strcspn(const char *s, const char *reject)
{ {
const char *p; const char *p;
const char *r;
size_t count = 0;
for (p = s; *p != '\0'; ++p) { for (p = s; *p != '\0'; ++p) {
for (r = reject; *r != '\0'; ++r) { if (strchr(reject, *p))
if (*p == *r) break;
return count;
}
++count;
} }
return count; return p - s;
} }
EXPORT_SYMBOL(strcspn); EXPORT_SYMBOL(strcspn);
#endif #endif