From 0d771855550208a77854478b2b8db3610d7be0dc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 8 Feb 2025 01:32:46 +0900 Subject: [PATCH] udev: sd_device_get_sysnum() provides non-NULL result on success This drops unnecessary conditions. --- src/udev/udev-builtin-path_id.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c index f85ad9b435..5237ae3090 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -234,7 +234,7 @@ static sd_device* handle_scsi_iscsi(sd_device *parent, char **path) { if (sd_device_get_sysattr_value(sessiondev, "targetname", &target) < 0) return NULL; - if (sd_device_get_sysnum(transportdev, &sysnum) < 0 || !sysnum) + if (sd_device_get_sysnum(transportdev, &sysnum) < 0) return NULL; connname = strjoina("connection", sysnum, ":0"); if (sd_device_new_from_subsystem_sysname(&conndev, "iscsi_connection", connname) < 0) @@ -716,7 +716,7 @@ static int builtin_path_id(UdevEvent *event, int argc, char *argv[]) { } else if (device_in_subsystem(parent, "serio")) { const char *sysnum; - if (sd_device_get_sysnum(parent, &sysnum) >= 0 && sysnum) { + if (sd_device_get_sysnum(parent, &sysnum) >= 0) { path_prepend(&path, "serio-%s", sysnum); parent = skip_subsystem(parent, "serio"); } @@ -810,7 +810,7 @@ static int builtin_path_id(UdevEvent *event, int argc, char *argv[]) { } else if (device_in_subsystem(parent, "spi")) { const char *sysnum; - if (sd_device_get_sysnum(parent, &sysnum) >= 0 && sysnum) { + if (sd_device_get_sysnum(parent, &sysnum) >= 0) { path_prepend(&path, "cs-%s", sysnum); parent = skip_subsystem(parent, "spi"); }