From 22d33e80909f7e197724e20789aef48cf61850af Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Jan 2021 23:54:32 +0900 Subject: [PATCH 1/3] sd-netlink: do not use downgrade-to-bool feature --- src/libsystemd/sd-netlink/rtnl-message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c index 7395ef89f8..4053bf792e 100644 --- a/src/libsystemd/sd-netlink/rtnl-message.c +++ b/src/libsystemd/sd-netlink/rtnl-message.c @@ -462,7 +462,7 @@ int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flags, unsign assert_return(m, -EINVAL); assert_return(m->hdr, -EINVAL); assert_return(rtnl_message_type_is_link(m->hdr->nlmsg_type), -EINVAL); - assert_return(change, -EINVAL); + assert_return(change != 0, -EINVAL); ifi = NLMSG_DATA(m->hdr); From d6ae82bdd9c52bd50e8fa5e8721fc8c7f8ae4207 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Jan 2021 23:55:37 +0900 Subject: [PATCH 2/3] sd-netlink: fix indentation --- src/libsystemd/sd-netlink/rtnl-message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c index 4053bf792e..ea97b1e6ad 100644 --- a/src/libsystemd/sd-netlink/rtnl-message.c +++ b/src/libsystemd/sd-netlink/rtnl-message.c @@ -679,7 +679,7 @@ int sd_rtnl_message_new_addr(sd_netlink *rtnl, sd_netlink_message **ret, } int sd_rtnl_message_new_addr_update(sd_netlink *rtnl, sd_netlink_message **ret, - int index, int family) { + int index, int family) { int r; r = sd_rtnl_message_new_addr(rtnl, ret, RTM_NEWADDR, index, family); From 49f236937784dfada808c59649575c4fdb1bff91 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Jan 2021 23:57:33 +0900 Subject: [PATCH 3/3] sd-device: do not use downgrade-to-bool feature --- src/libsystemd/sd-device/sd-device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index d1aa3282bf..00df63edb3 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -231,8 +231,7 @@ _public_ int sd_device_new_from_syspath(sd_device **ret, const char *syspath) { } _public_ int sd_device_new_from_devnum(sd_device **ret, char type, dev_t devnum) { - char *syspath; - char id[DECIMAL_STR_MAX(unsigned) * 2 + 1]; + char id[DECIMAL_STR_MAX(unsigned) * 2 + 1], *syspath; assert_return(ret, -EINVAL); assert_return(IN_SET(type, 'b', 'c'), -EINVAL); @@ -399,7 +398,7 @@ int device_set_devmode(sd_device *device, const char *_devmode) { } int device_set_devnum(sd_device *device, const char *major, const char *minor) { - unsigned maj = 0, min = 0; + unsigned maj, min = 0; int r; assert(device); @@ -408,7 +407,7 @@ int device_set_devnum(sd_device *device, const char *major, const char *minor) { r = safe_atou(major, &maj); if (r < 0) return r; - if (!maj) + if (maj == 0) return 0; if (minor) {