From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 3 Mar 2021 13:35:55 +0000 (+0100)
Subject: basic/string-util: split out helper function
X-Git-Tag: v249-rc1~274^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6302d38609b79042f90ee6f3e8a49bad6775e1a9;p=thirdparty%2Fsystemd.git

basic/string-util: split out helper function
---

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 058eec54ff9..c8ed87765f5 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -277,10 +277,7 @@ bool string_has_cc(const char *p, const char *ok) {
                 if (ok && strchr(ok, *t))
                         continue;
 
-                if (*t > 0 && *t < ' ')
-                        return true;
-
-                if (*t == 127)
+                if (char_is_cc(*t))
                         return true;
         }
 
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index cb2881b64d1..0dafe049ad1 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -129,6 +129,9 @@ static inline bool _pure_ in_charset(const char *s, const char* charset) {
         return s[strspn(s, charset)] == '\0';
 }
 
+static inline bool char_is_cc(char p) {
+        return (p >= 0 && p < ' ') || p == 127;
+}
 bool string_has_cc(const char *p, const char *ok) _pure_;
 
 char *ellipsize_mem(const char *s, size_t old_length_bytes, size_t new_length_columns, unsigned percent);