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.

4 files changed, 14 insertions, 28 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);
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 5aac5bca49..739bb185e9 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -202,10 +202,8 @@ int link_config_load(link_config_ctx *ctx) {
         paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, true);
 
         r = conf_files_list_strv(&files, ".link", NULL, link_dirs);
-        if (r < 0) {
-                log_error_errno(r, "failed to enumerate link files: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "failed to enumerate link files: %m");
 
         STRV_FOREACH_BACKWARDS(f, files) {
                 r = load_link(ctx, *f);
@@ -421,10 +419,8 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
 
         r = rtnl_set_link_properties(&ctx->rtnl, ifindex, config->alias, mac,
                                      config->mtu);
-        if (r < 0) {
-                log_warning_errno(r, "Could not set Alias, MACAddress or MTU on %s: %m", old_name);
-                return r;
-        }
+        if (r < 0)
+                return log_warning_errno(r, "Could not set Alias, MACAddress or MTU on %s: %m", old_name);
 
         *name = new_name;
 
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 2917c32413..5a7b65aff3 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -775,10 +775,8 @@ static int rename_netif(struct udev_event *event) {
         strscpy(name, IFNAMSIZ, event->name);
 
         r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name);
-        if (r < 0) {
-                log_error_errno(r, "Error changing net interface name '%s' to '%s': %m", oldname, name);
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Error changing net interface name '%s' to '%s': %m", oldname, name);
 
         log_debug("renamed network interface '%s' to '%s'", oldname, name);
 
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 55587fd5a8..beb5dc6ef1 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2652,10 +2652,8 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules) {
 
                                         strscpyl(tags_dir, sizeof(tags_dir), "/run/udev/static_node-tags/", *t, "/", NULL);
                                         r = mkdir_p(tags_dir, 0755);
-                                        if (r < 0) {
-                                                log_error_errno(r, "failed to create %s: %m", tags_dir);
-                                                return r;
-                                        }
+                                        if (r < 0)
+                                                return log_error_errno(r, "failed to create %s: %m", tags_dir);
 
                                         unescaped_filename = xescape(rules_str(rules, cur->key.value_off), "/.");