summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-08-06 19:04:49 +0200
committerSven Eden <sven.eden@prydeworx.com>2018-10-29 10:18:34 +0100
commit51c1454b9f79b8f936dd7013d29c39798a7dcb70 (patch)
treec34b0eae6af445bfd75a944d8fd5374114c2586b
parentb470c28684495d65b8eaf7733f92990fefe894ba (diff)
logind: voidify a few calls
(cherry picked from commit 75bbdf478c73d78bbe5bdee6f468c2e84a1844c6)
-rw-r--r--src/login/logind-seat.c4
-rw-r--r--src/login/logind-session.c2
-rw-r--r--src/login/logind-user-dbus.c2
-rw-r--r--src/login/logind-user.c2
-rw-r--r--src/login/logind.c12
5 files changed, 11 insertions, 11 deletions
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 4e607739f..8e5c5ac4c 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -242,7 +242,7 @@ int seat_set_active(Seat *s, Session *session) {
session_send_changed(old_active, "Active", NULL);
}
- seat_apply_acls(s, old_active);
+ (void) seat_apply_acls(s, old_active);
if (session && session->started) {
session_send_changed(session, "Active", NULL);
@@ -447,7 +447,7 @@ int seat_stop(Seat *s, bool force) {
seat_stop_sessions(s, force);
- unlink(s->state_file);
+ (void) unlink(s->state_file);
seat_add_to_gc_queue(s);
if (s->started)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index a65fc06b2..8715eee2c 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -1066,7 +1066,7 @@ static void session_remove_fifo(Session *s) {
s->fifo_fd = safe_close(s->fifo_fd);
if (s->fifo_path) {
- unlink(s->fifo_path);
+ (void) unlink(s->fifo_path);
s->fifo_path = mfree(s->fifo_path);
}
}
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index c662a26b9..9620fb0cf 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -109,7 +109,7 @@ static int property_get_idle_since_hint(
assert(reply);
assert(u);
- user_get_idle_hint(u, &t);
+ (void) user_get_idle_hint(u, &t);
k = streq(property, "IdleSinceHint") ? t.realtime : t.monotonic;
return sd_bus_message_append(reply, "t", k);
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 91611e88e..9285ed0b2 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -518,7 +518,7 @@ int user_finalize(User *u) {
r = k;
}
- unlink(u->state_file);
+ (void) unlink(u->state_file);
user_add_to_gc_queue(u);
if (u->started) {
diff --git a/src/login/logind.c b/src/login/logind.c
index 1be847377..d2b640460 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1020,13 +1020,13 @@ 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)
- session_stop(session, false);
+ (void) session_stop(session, false);
/* Normally, this should make the session referenced
* again, if it doesn't then let's get rid of it
* immediately */
if (session_may_gc(session, drop_not_started)) {
- session_finalize(session);
+ (void) session_finalize(session);
session_free(session);
}
}
@@ -1037,11 +1037,11 @@ static void manager_gc(Manager *m, bool drop_not_started) {
/* First step: queue stop jobs */
if (user_may_gc(user, drop_not_started))
- user_stop(user, false);
+ (void) user_stop(user, false);
/* Second step: finalize user */
if (user_may_gc(user, drop_not_started)) {
- user_finalize(user);
+ (void) user_finalize(user);
user_free(user);
}
}
@@ -1201,10 +1201,10 @@ static int manager_startup(Manager *m) {
/* And start everything */
HASHMAP_FOREACH(seat, m->seats, i)
- seat_start(seat);
+ (void) seat_start(seat);
HASHMAP_FOREACH(user, m->users, i)
- user_start(user);
+ (void) user_start(user);
HASHMAP_FOREACH(session, m->sessions, i)
session_start(session, NULL);