chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: add .ScheduleShutdown and .CancelScheduledShutdown methods
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index ea7c6e74b0e275f19a4f5850c2466bac04ab2b74..3a4afdd266b8d65a698c7e6d3cb9fb806ff0ff43 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-34,7
+34,9
@@
#include "udev-util.h"
#include "formats-util.h"
#include "udev-util.h"
#include "formats-util.h"
-Manager *manager_new(void) {
+static void manager_free(Manager *m);
+
+static Manager *manager_new(void) {
Manager *m;
int r;
Manager *m;
int r;
@@
-100,7
+102,7
@@
fail:
return NULL;
}
return NULL;
}
-void manager_free(Manager *m) {
+
static
void manager_free(Manager *m) {
Session *session;
User *u;
Device *d;
Session *session;
User *u;
Device *d;
@@
-142,6
+144,7
@@
void manager_free(Manager *m) {
sd_event_source_unref(m->idle_action_event_source);
sd_event_source_unref(m->inhibit_timeout_source);
sd_event_source_unref(m->idle_action_event_source);
sd_event_source_unref(m->inhibit_timeout_source);
+ sd_event_source_unref(m->scheduled_shutdown_timeout_source);
sd_event_source_unref(m->console_active_event_source);
sd_event_source_unref(m->udev_seat_event_source);
sd_event_source_unref(m->console_active_event_source);
sd_event_source_unref(m->udev_seat_event_source);
@@
-174,6
+177,7
@@
void manager_free(Manager *m) {
strv_free(m->kill_only_users);
strv_free(m->kill_exclude_users);
strv_free(m->kill_only_users);
strv_free(m->kill_exclude_users);
+ free(m->scheduled_shutdown_type);
free(m->action_job);
free(m);
}
free(m->action_job);
free(m);
}
@@
-890,7
+894,7
@@
static int manager_connect_udev(Manager *m) {
return 0;
}
return 0;
}
-void manager_gc(Manager *m, bool drop_not_started) {
+
static
void manager_gc(Manager *m, bool drop_not_started) {
Seat *seat;
Session *session;
User *user;
Seat *seat;
Session *session;
User *user;
@@
-1001,7
+1005,7
@@
static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us
return 0;
}
return 0;
}
-int manager_startup(Manager *m) {
+
static
int manager_startup(Manager *m) {
int r;
Seat *seat;
Session *session;
int r;
Seat *seat;
Session *session;
@@
-1088,7
+1092,7
@@
int manager_startup(Manager *m) {
return 0;
}
return 0;
}
-int manager_run(Manager *m) {
+
static
int manager_run(Manager *m) {
int r;
assert(m);
int r;
assert(m);