From 01f83c1c765db13e20a241a48733333360457718 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Tue, 11 Mar 2014 18:51:17 -0700 Subject: [PATCH] util: Make in_charset a static inline in util.h With in_charset now reduced to a one-liner (plus asserts), make it a static inline. --- src/shared/util.c | 6 ------ src/shared/util.h | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c index e1a1168456..9e8cd54d04 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -920,12 +920,6 @@ char *delete_chars(char *s, const char *bad) { return s; } -bool in_charset(const char *s, const char* charset) { - assert(s); - assert(charset); - return s[strspn(s, charset)] == '\0'; -} - char *file_in_same_dir(const char *path, const char *filename) { char *e, *r; size_t k; diff --git a/src/shared/util.h b/src/shared/util.h index cc52ae7503..81831e2771 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -531,7 +531,11 @@ char *strjoin(const char *x, ...) _sentinel_; bool is_main_thread(void); -bool in_charset(const char *s, const char* charset) _pure_; +static inline bool _pure_ in_charset(const char *s, const char* charset) { + assert(s); + assert(charset); + return s[strspn(s, charset)] == '\0'; +} int block_get_whole_disk(dev_t d, dev_t *ret);