From f647962d64e844689f3e2acfce6102fc47e76df2 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 18:50:43 +0100 Subject: 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. --- src/udev/udev-event.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/udev/udev-event.c') 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); -- cgit v1.2.3-54-g00ecf