tree-wide: port various places over to STARTSWITH_SET()

2018-11-26 14:08:46 +01:00
parent 52f1552073
commit 49fe5c0996
11 changed files with 31 additions and 51 deletions
@@ -510,11 +510,9 @@ static int add_crypttab_devices(void) {
                        continue;
                }

-                uuid = startswith(device, "UUID=");
+                uuid = STARTSWITH_SET(device, "UUID=", "luks-");
                if (!uuid)
                        uuid = path_startswith(device, "/dev/disk/by-uuid/");
-                if (!uuid)
-                        uuid = startswith(name, "luks-");
                if (uuid)
                        d = hashmap_get(arg_disks, uuid);