Merge pull request #10901 from poettering/startswith-list

add new STARTSWITH_SET() macro
2018-11-26 22:40:51 +09:00
parent a7f71a01b8 3ebc048b6b
commit 938dbb292a
22 changed files with 105 additions and 97 deletions
@@ -1427,17 +1427,10 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
 }

 static const char *timezone_from_path(const char *path) {
-        const char *z;
-
-        z = path_startswith(path, "../usr/share/zoneinfo/");
-        if (z)
-                return z;
-
-        z = path_startswith(path, "/usr/share/zoneinfo/");
-        if (z)
-                return z;
-
-        return NULL;
+        return PATH_STARTSWITH_SET(
+                        path,
+                        "../usr/share/zoneinfo/",
+                        "/usr/share/zoneinfo/");
 }

 static int setup_timezone(const char *dest) {