tree-wide: use PATH_STARTSWITH_SET() at two more places

This commit is contained in:
Lennart Poettering
2018-06-11 18:01:06 +02:00
parent 57e84e7535
commit bae47ba7d2
2 changed files with 3 additions and 6 deletions
+2 -4
View File
@@ -886,11 +886,9 @@ bool hidden_or_backup_file(const char *filename) {
bool is_device_path(const char *path) {
/* Returns true on paths that refer to a device, either in
* sysfs or in /dev */
/* Returns true on paths that likely refer to a device, either by path in sysfs or to something in /dev */
return path_startswith(path, "/dev/") ||
path_startswith(path, "/sys/");
return PATH_STARTSWITH_SET(path, "/dev/", "/sys/");
}
bool valid_device_node_path(const char *path) {
+1 -2
View File
@@ -546,8 +546,7 @@ static int device_process_new(Manager *m, struct udev_device *dev) {
/* Don't bother with the /dev/block links */
p = udev_list_entry_get_name(item);
if (path_startswith(p, "/dev/block/") ||
path_startswith(p, "/dev/char/"))
if (PATH_STARTSWITH_SET(p, "/dev/block/", "/dev/char/"))
continue;
/* Verify that the symlink in the FS actually belongs