chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v225: Remove some orphaned files
[elogind.git]
/
src
/
shared
/
socket-util.c
diff --git
a/src/shared/socket-util.c
b/src/shared/socket-util.c
index e8bb10dc9bb9d5ba09ca199b7afaf78361471949..62f99b322ec68b9d6ece112c50fd28b3b25c71a0 100644
(file)
--- 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)
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)
log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret);
} else {
ret = strdup(host);
if (!ret)
- return
log_oom()
;
+ return
-ENOMEM
;
}
*_ret = ret;
}
*_ret = ret;
@@
-683,7
+683,7
@@
int getnameinfo_pretty(int fd, char **ret) {
assert(ret);
if (getsockname(fd, &sa.sa, &salen) < 0)
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);
}
return socknameinfo_pretty(&sa, salen, ret);
}