summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-07-29 12:33:44 +0200
committerLennart Poettering <lennart@poettering.net>2015-07-29 12:38:22 +0200
commit1938ac5136ddd87dd4f0bccc42b6f5d41f4ca6ba (patch)
tree7180e30bcb5803046499741a1b0b2d3f3430a2ab /src/basic
parent87b46c575a14c133fbc408b56b0835f13a918b1d (diff)
socket-util: library calls shouldn't log on their own
Instead, make sure that all callers log properly.
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/socket-util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index e8bb10dc9b..62f99b322e 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -662,13 +662,13 @@ int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret)
r = sockaddr_pretty(&sa->sa, salen, true, true, &ret);
if (r < 0)
- return log_error_errno(r, "sockadd_pretty() failed: %m");
+ return r;
log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret);
} else {
ret = strdup(host);
if (!ret)
- return log_oom();
+ return -ENOMEM;
}
*_ret = ret;
@@ -683,7 +683,7 @@ int getnameinfo_pretty(int fd, char **ret) {
assert(ret);
if (getsockname(fd, &sa.sa, &salen) < 0)
- return log_error_errno(errno, "getsockname(%d) failed: %m", fd);
+ return -errno;
return socknameinfo_pretty(&sa, salen, ret);
}