chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: add minimal firewall manipulation helpers for establishing NAT rules, using...
[elogind.git]
/
src
/
shared
/
socket-util.c
diff --git
a/src/shared/socket-util.c
b/src/shared/socket-util.c
index 6ef68fce09fe1a54682f1bf024a2b077ea746206..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);
int saved_errno = errno;
r = sockaddr_pretty(&sa->sa, salen, true, &ret);
- if (r < 0) {
- log_error_errno(r, "sockadd_pretty() failed: %m");
- 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)
} else {
ret = strdup(host);
if (!ret)
@@
-659,10
+657,8
@@
int getnameinfo_pretty(int fd, char **ret) {
assert(fd >= 0);
assert(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);
}
return socknameinfo_pretty(&sa, salen, ret);
}