diff --git a/src/basic/string-util.c b/src/basic/string-util.c index 058eec54ff..c8ed87765f 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 cb2881b64d..0dafe049ad 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);