From c8a09ef46302b4bafe36623857a60eafa6b76e2e Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Thu, 11 Jun 2015 13:08:19 +0530 Subject: networkd: macvlan improve logging Replace strerror() usage with log_netdev_error_errno() --- src/network/networkd-netdev-macvlan.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/network/networkd-netdev-macvlan.c b/src/network/networkd-netdev-macvlan.c index 5f41f1c865..a8bf6e6bb7 100644 --- a/src/network/networkd-netdev-macvlan.c +++ b/src/network/networkd-netdev-macvlan.c @@ -44,13 +44,9 @@ static int netdev_macvlan_fill_message_create(NetDev *netdev, Link *link, sd_rtn assert(netdev->ifname); if (m->mode != _NETDEV_MACVLAN_MODE_INVALID) { - r = sd_rtnl_message_append_u32(req, IFLA_MACVLAN_MODE, m->mode); - if (r < 0) { - log_netdev_error(netdev, - "Could not append IFLA_MACVLAN_MODE attribute: %s", - strerror(-r)); - return r; - } + r = sd_rtnl_message_append_u32(req, IFLA_MACVLAN_MODE, m->mode); + if (r < 0) + return log_netdev_error_errno(netdev, r, "Could not append IFLA_MACVLAN_MODE attribute: %m"); } return 0; -- cgit v1.2.3-54-g00ecf From f6a0ea8568c6d2676239da7f8c67ae6b496fffa4 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Thu, 11 Jun 2015 13:11:33 +0530 Subject: networkd: improve logging Replace strerror() usage with log_netdev_error_errno() --- src/network/networkd-netdev-ipvlan.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/network/networkd-netdev-ipvlan.c b/src/network/networkd-netdev-ipvlan.c index 5189000c1f..f1c8e0ccdb 100644 --- a/src/network/networkd-netdev-ipvlan.c +++ b/src/network/networkd-netdev-ipvlan.c @@ -42,13 +42,9 @@ static int netdev_ipvlan_fill_message_create(NetDev *netdev, Link *link, sd_rtnl assert(netdev->ifname); if (m->mode != _NETDEV_IPVLAN_MODE_INVALID) { - r = sd_rtnl_message_append_u16(req, IFLA_IPVLAN_MODE, m->mode); - if (r < 0) { - log_netdev_error(netdev, - "Could not append IFLA_IPVLAN_MODE attribute: %s", - strerror(-r)); - return r; - } + r = sd_rtnl_message_append_u16(req, IFLA_IPVLAN_MODE, m->mode); + if (r < 0) + return log_netdev_error_errno(netdev, r, "Could not append IFLA_IPVLAN_MODE attribute: %m"); } return 0; -- cgit v1.2.3-54-g00ecf From 3de1c8ceabfc170a38798476ff378e2fbc06dbad Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Thu, 11 Jun 2015 14:07:15 +0530 Subject: sd-network: fix CID 1306198 --- src/libsystemd/sd-network/sd-network.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index 207eda163b..b63fdf8fcb 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c @@ -338,10 +338,8 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category good = true; } - if (!good) { - close_nointr(fd); + if (!good) return -EINVAL; - } *m = FD_TO_MONITOR(fd); fd = -1; -- cgit v1.2.3-54-g00ecf