]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
logind: clarify what the second argument of session_stop() means when calling it
authorLennart Poettering <lennart@poettering.net>
Fri, 11 Sep 2020 15:59:39 +0000 (17:59 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 11 Sep 2020 16:09:30 +0000 (18:09 +0200)
src/login/logind-seat-dbus.c
src/login/logind-session-dbus.c
src/login/logind-session.c
src/login/logind-user-dbus.c
src/login/logind.c

index ee2088018c9e246e60f7694314a4a11b62a2eb29..a9451322847ae3e683a2536d28b41f5f97d00da7 100644 (file)
@@ -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;
 
index d505dac8d0ee33e77e5ab0105343a12369a98351..ccc5ac8df248a4033d6b4a28c93e26a35349627a 100644 (file)
@@ -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;
 
index 1b0d51eb285788d7a1197cbeb47f8afbd6cd1d80..c9873155bb9953775200286479221b6dfd6eddb6 100644 (file)
@@ -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;
 }
index 5141ac0476b65a457bfeaaacad5566b71bf8ea8d..307462f749b27355f2d431d4428525263f86efea 100644 (file)
@@ -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;
 
index 9fd862e23ce7d4d33a794f5d7f75502e465225ae..677a501e9821fa3d879dd51d18d7584a1afa551a 100644 (file)
@@ -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