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/shared/socket-util.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/shared/socket-util.c') diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c index 0bb34f7826..6bdcb99205 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -636,10 +636,8 @@ int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret) int saved_errno = errno; r = sockaddr_pretty(&sa->sa, salen, true, &ret); - if (r < 0) { - log_error_errno(r, "sockadd_pretty() failed: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "sockadd_pretty() failed: %m"); log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret); } else { -- cgit v1.2.3-54-g00ecf