From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 29 Nov 2023 10:21:21 +0000 (+0100)
Subject: logind: use unlink_and_free() at once more place
X-Git-Tag: v256-rc1~1292
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=489f67b4d877e98dbdc0299750e8fefcd8bf0563;p=thirdparty%2Fsystemd.git

logind: use unlink_and_free() at once more place
---

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 979e506897e..6b3f786fe91 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -1288,11 +1288,7 @@ static void session_remove_fifo(Session *s) {
 
         s->fifo_event_source = sd_event_source_unref(s->fifo_event_source);
         s->fifo_fd = safe_close(s->fifo_fd);
-
-        if (s->fifo_path) {
-                (void) unlink(s->fifo_path);
-                s->fifo_path = mfree(s->fifo_path);
-        }
+        s->fifo_path = unlink_and_free(s->fifo_path);
 }
 
 bool session_may_gc(Session *s, bool drop_not_started) {