X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkctl.c;h=53516638dcc2f4d62d78cb0d6d37d8fb7e2a5ce3;hb=5eb9e762eab5faa1bc995a39ebbb8fc694755c3e;hp=b374121fbc8d80cbe84beb2a5f33b6da417c2331;hpb=af5effc4220dab6c4c87a130bae7be441f6967ca;p=elogind.git

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index b374121fb..53516638d 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -190,16 +190,12 @@ static int list_links(char **args, unsigned n) {
         pager_open_if_enabled();
 
         r = sd_rtnl_open(&rtnl, 0);
-        if (r < 0) {
-                log_error("Failed to connect to netlink: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to connect to netlink: %m");
 
         udev = udev_new();
-        if (!udev) {
-                log_error("Failed to connect to udev: %m");
-                return -errno;
-        }
+        if (!udev)
+                return log_error_errno(errno, "Failed to connect to udev: %m");
 
         r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0);
         if (r < 0)
@@ -210,10 +206,8 @@ static int list_links(char **args, unsigned n) {
                 return rtnl_log_create_error(r);
 
         r = sd_rtnl_call(rtnl, req, 0, &reply);
-        if (r < 0) {
-                log_error("Failed to enumerate links: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to enumerate links: %m");
 
         if (arg_legend)
                 printf("%3s %-16s %-18s %-11s %-10s\n", "IDX", "LINK", "TYPE", "OPERATIONAL", "SETUP");
@@ -322,10 +316,8 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
                 return rtnl_log_create_error(r);
 
         r = sd_rtnl_call(rtnl, req, 0, &reply);
-        if (r < 0) {
-                log_error("Failed to query link: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to query link: %m");
 
         r = sd_rtnl_message_link_get_ifindex(reply, &ifindex);
         if (r < 0)
@@ -447,16 +439,12 @@ static int link_status(char **args, unsigned n) {
         int r;
 
         r = sd_rtnl_open(&rtnl, 0);
-        if (r < 0) {
-                log_error("Failed to connect to netlink: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to connect to netlink: %m");
 
         udev = udev_new();
-        if (!udev) {
-                log_error("Failed to connect to udev: %m");
-                return -errno;
-        }
+        if (!udev)
+                return log_error_errno(errno, "Failed to connect to udev: %m");
 
         if (n <= 1 && !arg_all) {
                 _cleanup_free_ char *operational_state = NULL;
@@ -513,10 +501,8 @@ static int link_status(char **args, unsigned n) {
                         return rtnl_log_create_error(r);
 
                 r = sd_rtnl_call(rtnl, req, 0, &reply);
-                if (r < 0) {
-                        log_error("Failed to enumerate links: %s", strerror(-r));
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to enumerate links: %m");
 
                 c = decode_and_sort_links(reply, &links);
                 if (c < 0)