From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 11 Sep 2020 15:59:39 +0000 (+0200)
Subject: logind: clarify what the second argument of session_stop() means when calling it
X-Git-Tag: v247-rc1~250^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bda625730dcf861842c0e26c8a05ed4510162298;p=thirdparty%2Fsystemd.git

logind: clarify what the second argument of session_stop() means when calling it
---

diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index ee2088018c9..a9451322847 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -152,7 +152,7 @@ int bus_seat_method_terminate(sd_bus_message *message, void *userdata, sd_bus_er
         if (r == 0)
                 return 1; /* Will call us back */
 
-        r = seat_stop_sessions(s, true);
+        r = seat_stop_sessions(s, /* force = */ true);
         if (r < 0)
                 return r;
 
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index d505dac8d0e..ccc5ac8df24 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -178,7 +178,7 @@ int bus_session_method_terminate(sd_bus_message *message, void *userdata, sd_bus
         if (r == 0)
                 return 1; /* Will call us back */
 
-        r = session_stop(s, true);
+        r = session_stop(s, /* force = */ true);
         if (r < 0)
                 return r;
 
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 1b0d51eb285..c9873155bb9 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -881,7 +881,7 @@ static int release_timeout_callback(sd_event_source *es, uint64_t usec, void *us
         assert(es);
         assert(s);
 
-        session_stop(s, false);
+        session_stop(s, /* force = */ false);
         return 0;
 }
 
@@ -1053,7 +1053,7 @@ static int session_dispatch_fifo(sd_event_source *es, int fd, uint32_t revents,
         /* EOF on the FIFO means the session died abnormally. */
 
         session_remove_fifo(s);
-        session_stop(s, false);
+        session_stop(s, /* force = */ false);
 
         return 1;
 }
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 5141ac0476b..307462f749b 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -216,7 +216,7 @@ int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_er
         if (r == 0)
                 return 1; /* Will call us back */
 
-        r = user_stop(u, true);
+        r = user_stop(u, /* force */ true);
         if (r < 0)
                 return r;
 
diff --git a/src/login/logind.c b/src/login/logind.c
index 9fd862e23ce..677a501e982 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -912,7 +912,7 @@ static void manager_gc(Manager *m, bool drop_not_started) {
                 seat->in_gc_queue = false;
 
                 if (seat_may_gc(seat, drop_not_started)) {
-                        seat_stop(seat, false);
+                        seat_stop(seat, /* force = */ false);
                         seat_free(seat);
                 }
         }
@@ -924,7 +924,7 @@ static void manager_gc(Manager *m, bool drop_not_started) {
                 /* First, if we are not closing yet, initiate stopping */
                 if (session_may_gc(session, drop_not_started) &&
                     session_get_state(session) != SESSION_CLOSING)
-                        (void) session_stop(session, false);
+                        (void) session_stop(session, /* force = */ false);
 
                 /* Normally, this should make the session referenced
                  * again, if it doesn't then let's get rid of it