shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

socket-util: shorten code a bit

Browse Source
This commit is contained in:
Lennart Poettering 2018-12-04 18:20:12 +01:00
parent 73da50222c
commit 994b9d4e90
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/basic/socket-util.c
View File

@ -651,14 +651,10 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_
case AF_UNIX: case AF_UNIX:
if (salen <= offsetof(struct sockaddr_un, sun_path) || if (salen <= offsetof(struct sockaddr_un, sun_path) ||
(sa->un.sun_path[0] == 0 && salen == offsetof(struct sockaddr_un, sun_path) + 1)) { (sa->un.sun_path[0] == 0 && salen == offsetof(struct sockaddr_un, sun_path) + 1))
/* The name must have at least one character (and the leading NUL does not count) */ /* The name must have at least one character (and the leading NUL does not count) */
p = strdup("<unnamed>"); p = strdup("<unnamed>");
if (!p) else {
return -ENOMEM;
} else {
size_t path_len = salen - offsetof(struct sockaddr_un, sun_path); size_t path_len = salen - offsetof(struct sockaddr_un, sun_path);
if (sa->un.sun_path[0] == 0) { if (sa->un.sun_path[0] == 0) {
@ -681,9 +677,9 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_
p = cescape_length(sa->un.sun_path, path_len); p = cescape_length(sa->un.sun_path, path_len);
} }
if (!p)
return -ENOMEM;
} }
if (!p)
return -ENOMEM;
break; break;