]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
socket-util: shorten code a bit
authorLennart Poettering <lennart@poettering.net>
Tue, 4 Dec 2018 17:20:12 +0000 (18:20 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 4 Dec 2018 22:28:14 +0000 (23:28 +0100)
src/basic/socket-util.c

index 9bae1552fc4486be5b28418d1cc7bad13f9716f7..104d6df4958e58bab123b3971eff1718064e4c02 100644 (file)
@@ -651,14 +651,10 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_
 
         case AF_UNIX:
                 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) */
-
                         p = strdup("<unnamed>");
-                        if (!p)
-                                return -ENOMEM;
-
-                } else {
+                else {
                         size_t path_len = salen - offsetof(struct sockaddr_un, sun_path);
 
                         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);
                         }
-                        if (!p)
-                                        return -ENOMEM;
                 }
+                if (!p)
+                        return -ENOMEM;
 
                 break;