treewide: yet more log_*_errno + return simplifications

Using:
find . -name '*.[ch]' | while read f; do perl -i.mmm -e \
 'local $/;
  local $_=<>;
  s/(if\s*\([^\n]+\))\s*{\n(\s*)(log_[a-z_]*_errno\(\s*([->a-zA-Z_]+)\s*,[^;]+);\s*return\s+\g4;\s+}/\1\n\2return \3;/msg;
  print;'
 $f
done

And a couple of manual whitespace fixups.

1 files changed, 6 insertions, 12 deletions

diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index 4608a6c982..ec67126b21 100644
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -75,10 +75,8 @@ int ethtool_get_driver(int *fd, const char *ifname, char **ret) {
 
         if (*fd < 0) {
                 r = ethtool_connect(fd);
-                if (r < 0) {
-                        log_warning_errno(r, "link_config: could not connect to ethtool: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_warning_errno(r, "link_config: could not connect to ethtool: %m");
         }
 
         strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
@@ -111,10 +109,8 @@ int ethtool_set_speed(int *fd, const char *ifname, unsigned int speed, Duplex du
 
         if (*fd < 0) {
                 r = ethtool_connect(fd);
-                if (r < 0) {
-                        log_warning_errno(r, "link_config: could not connect to ethtool: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_warning_errno(r, "link_config: could not connect to ethtool: %m");
         }
 
         strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
@@ -171,10 +167,8 @@ int ethtool_set_wol(int *fd, const char *ifname, WakeOnLan wol) {
 
         if (*fd < 0) {
                 r = ethtool_connect(fd);
-                if (r < 0) {
-                        log_warning_errno(r, "link_config: could not connect to ethtool: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_warning_errno(r, "link_config: could not connect to ethtool: %m");
         }
 
         strscpy(ifr.ifr_name, IFNAMSIZ, ifname);