From db81c47d7076c57672cfc4144ec52c9762301920 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 6 Aug 2018 19:05:57 +0200 Subject: logind: prefer strjoin() over asprintf() (cherry picked from commit d5ddc930150633f9ce38ed4a6dc9accfd7ceaaac) --- src/login/logind-session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 970d5396c..05b79685a 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -1024,7 +1024,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) @@ -1036,7 +1037,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) { -- cgit v1.2.3