From e0333c7314e89c0bc268bd20c5e247a7c907ab34 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Tue, 11 Mar 2014 16:45:56 -0700 Subject: [PATCH] util: Rewrite in_charset to use strspn This simplifies in_charset down to a one-liner, and allows for possible optimizations of strspn in libc. --- src/shared/util.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c index 10f113bd2..e1a116845 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -921,16 +921,9 @@ char *delete_chars(char *s, const char *bad) { } bool in_charset(const char *s, const char* charset) { - const char *i; - assert(s); assert(charset); - - for (i = s; *i; i++) - if (!strchr(charset, *i)) - return false; - - return true; + return s[strspn(s, charset)] == '\0'; } char *file_in_same_dir(const char *path, const char *filename) { -- 2.30.2