From e5e0a79623d0dd67f15882bb328747993e3244f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 23 Nov 2018 09:24:26 +0100 Subject: [PATCH] pid1,sd-device: use PATH_STARTSWITH_SET more --- src/core/umount.c | 4 +--- src/libsystemd/sd-device/sd-device.c | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/core/umount.c b/src/core/umount.c index 47313da2310..9e6c404ab96 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -121,9 +121,7 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) { * unmount these things, hence don't bother. */ if (mount_point_is_api(p) || mount_point_ignore(p) || - path_startswith(p, "/dev") || - path_startswith(p, "/sys") || - path_startswith(p, "/proc")) + PATH_STARTSWITH_SET(p, "/dev", "/sys", "/proc")) continue; /* If we are in a container, don't attempt to diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index d8df1250fee..dc75f91e21c 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -793,9 +793,9 @@ _public_ int sd_device_get_subsystem(sd_device *device, const char **ret) { else if (path_startswith(device->devpath, "/module/")) r = device_set_subsystem(device, "module"); else if (!(drivers = strstr(syspath, "/drivers/")) && - (path_startswith(device->devpath, "/subsystem/") || - path_startswith(device->devpath, "/class/") || - path_startswith(device->devpath, "/bus/"))) + PATH_STARTSWITH_SET(device->devpath, "/subsystem/", + "/class/", + "/bus/")) r = device_set_subsystem(device, "subsystem"); if (r < 0 && r != -ENOENT) return log_device_debug_errno(device, r, "sd-device: Failed to set subsystem for %s: %m", device->devpath); -- 2.47.3