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-label.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/shared/socket-label.c') diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c index 7a03ac0c51..815b90fdfb 100644 --- a/src/shared/socket-label.c +++ b/src/shared/socket-label.c @@ -161,10 +161,8 @@ int make_socket_fd(int log_level, const char* address, int flags) { _cleanup_free_ char *p = NULL; r = socket_address_print(&a, &p); - if (r < 0) { - log_error_errno(r, "socket_address_print(): %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "socket_address_print(): %m"); if (fd < 0) log_error_errno(fd, "Failed to listen on %s: %m", p); -- cgit v1.2.3-54-g00ecf