udev: builtin-hwdb - port to sd-hwdb

[elogind.git] / src / shared / socket-util.c

diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
index 911dbfe55a409445f585fbc1d1d7b6ffe585b2eb..c6f64876be4485f6a9c2b4aab41b04b2a094563d 100644 (file)
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -636,12 +636,10 @@ 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("sockadd_pretty() failed: %s", strerror(-r));
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "sockadd_pretty() failed: %m");
 
-                log_debug("getnameinfo(%s) failed: %s", ret, strerror(saved_errno));
+                log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret);
         } else {
                 ret = strdup(host);
                 if (!ret)
@@ -659,10 +657,8 @@ int getnameinfo_pretty(int fd, char **ret) {
         assert(fd >= 0);
         assert(ret);
 
-        if (getsockname(fd, &sa.sa, &salen) < 0) {
-                log_error("getsockname(%d) failed: %m", fd);
-                return -errno;
-        }
+        if (getsockname(fd, &sa.sa, &salen) < 0)
+                return log_error_errno(errno, "getsockname(%d) failed: %m", fd);
 
         return socknameinfo_pretty(&sa, salen, ret);
 }