From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 12 Mar 2014 01:51:17 +0000 (-0700)
Subject: util: Make in_charset a static inline in util.h
X-Git-Tag: v212~209
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=01f83c1c765db13e20a241a48733333360457718;hp=e0333c7314e89c0bc268bd20c5e247a7c907ab34

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.
---

diff --git a/src/shared/util.c b/src/shared/util.c
index e1a116845..9e8cd54d0 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 cc52ae750..81831e277 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);