From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 19 Dec 2017 11:12:01 +0000 (+0900)
Subject: core/socket: shorten socket_fdname()
X-Git-Tag: v237~183^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=845001221d6bf2e4aff3a923376e845b8dcca9ec;p=thirdparty%2Fsystemd.git

core/socket: shorten socket_fdname()
---

diff --git a/src/core/socket.c b/src/core/socket.c
index eb1c0bfa32b..d2c469433d3 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -3250,10 +3250,7 @@ char *socket_fdname(Socket *s) {
          * didn't specify anything specifically, use the socket unit's
          * name as fallback. */
 
-        if (s->fdname)
-                return s->fdname;
-
-        return UNIT(s)->id;
+        return s->fdname ?: UNIT(s)->id;
 }
 
 static int socket_control_pid(Unit *u) {