From 486cd82c8f7642016895b72bcc09a1bfe885a783 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Thu, 28 Nov 2013 17:29:01 +0100 Subject: [PATCH] logind: remove unused session->closing field This field is always false, drop it. If you want a reliable way to get session state, call session_get_state(). Testing for any flags directly doesn't work currently so don't pretend it would. --- src/login/logind-dbus.c | 1 - src/login/logind-session.c | 3 --- src/login/logind-session.h | 1 - 3 files changed, 5 deletions(-) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 9538150..a4bdf5f 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1252,7 +1252,6 @@ static int have_multiple_sessions( * count, and non-login sessions do not count either. */ HASHMAP_FOREACH(session, m->sessions, i) if (session->class == SESSION_USER && - !session->closing && session->user->uid != uid) return true; diff --git a/src/login/logind-session.c b/src/login/logind-session.c index a72b13e..beaa601 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -954,9 +954,6 @@ void session_add_to_gc_queue(Session *s) { SessionState session_get_state(Session *s) { assert(s); - if (s->closing) - return SESSION_CLOSING; - if (s->scope_job) return SESSION_OPENING; diff --git a/src/login/logind-session.h b/src/login/logind-session.h index 939476a..ee93101 100644 --- a/src/login/logind-session.h +++ b/src/login/logind-session.h @@ -107,7 +107,6 @@ struct Session { bool in_gc_queue:1; bool started:1; - bool closing:1; sd_bus_message *create_message; -- 2.7.4