From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 29 Jul 2015 10:33:44 +0000 (+0200)
Subject: socket-util: library calls shouldn't log on their own
X-Git-Tag: v226.4~1^2~172
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9abef11725a3fc2bbeca06ec89ae17b3da0f6250;ds=sidebyside

socket-util: library calls shouldn't log on their own

Instead, make sure that all callers log properly.
---

diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
index e8bb10dc9..62f99b322 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/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);
 }