summaryrefslogtreecommitdiff
path: root/src/shared/socket-label.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 18:50:43 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 18:56:16 +0100
commitf647962d64e844689f3e2acfce6102fc47e76df2 (patch)
treedcaf5e38de1d4e31f73f540bc85532ceb72cfa6b /src/shared/socket-label.c
parente80733be33e52d8ab2f1ae845326d39c600f5612 (diff)
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.
Diffstat (limited to 'src/shared/socket-label.c')
-rw-r--r--src/shared/socket-label.c6
1 files changed, 2 insertions, 4 deletions
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);