From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Aug 2018 17:05:57 +0000 (+0200)
Subject: logind: prefer strjoin() over asprintf()
X-Git-Tag: v240~549^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5ddc930150633f9ce38ed4a6dc9accfd7ceaaac;p=thirdparty%2Fsystemd.git

logind: prefer strjoin() over asprintf()
---

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index a8972303973..32e40bb6217 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -960,7 +960,8 @@ int session_create_fifo(Session *s) {
                 if (r < 0)
                         return r;
 
-                if (asprintf(&s->fifo_path, "/run/systemd/sessions/%s.ref", s->id) < 0)
+                s->fifo_path = strjoin("/run/systemd/sessions/", s->id, ".ref");
+                if (!s->fifo_path)
                         return -ENOMEM;
 
                 if (mkfifo(s->fifo_path, 0600) < 0 && errno != EEXIST)
@@ -972,7 +973,6 @@ int session_create_fifo(Session *s) {
                 s->fifo_fd = open(s->fifo_path, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
                 if (s->fifo_fd < 0)
                         return -errno;
-
         }
 
         if (!s->fifo_event_source) {