From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 14 Apr 2021 06:07:12 +0000 (+0900)
Subject: util: shorten allow_listed_char_for_devnode()
X-Git-Tag: v249-rc1~418
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c68ede3952aa3a080f9de170c7963e3fae0c65b7;p=thirdparty%2Fsystemd.git

util: shorten allow_listed_char_for_devnode()
---

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);