From c68ede3952aa3a080f9de170c7963e3fae0c65b7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 14 Apr 2021 15:07:12 +0900 Subject: [PATCH] util: shorten allow_listed_char_for_devnode() --- src/basic/device-nodes.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/basic/device-nodes.c b/src/basic/device-nodes.c index 158ab738e83..ec5613ac583 100644 --- a/src/basic/device-nodes.c +++ b/src/basic/device-nodes.c @@ -8,15 +8,12 @@ #include "utf8.h" int allow_listed_char_for_devnode(char c, const char *white) { - - if ((c >= '0' && c <= '9') || - (c >= 'A' && c <= 'Z') || - (c >= 'a' && c <= 'z') || - strchr("#+-.:=@_", c) != NULL || - (white != NULL && strchr(white, c) != NULL)) - return 1; - - return 0; + return + (c >= '0' && c <= '9') || + (c >= 'A' && c <= 'Z') || + (c >= 'a' && c <= 'z') || + strchr("#+-.:=@_", c) || + (white && strchr(white, c)); } int encode_devnode_name(const char *str, char *str_enc, size_t len) { @@ -31,7 +28,7 @@ int encode_devnode_name(const char *str, char *str_enc, size_t len) { seqlen = utf8_encoded_valid_unichar(str + i, SIZE_MAX); if (seqlen > 1) { - if (len-j < (size_t)seqlen) + if (len-j < (size_t) seqlen) return -EINVAL; memcpy(&str_enc[j], &str[i], seqlen); -- 2.47.3