chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: convert PID 1 to libsystemd-bus
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index e334bebdf84230ad8cf1db82918bc9650e326397..47b306b6194df13e42c0ce097edc28f6982a8aeb 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-90,7
+90,7
@@
Manager *manager_new(void) {
return NULL;
}
return NULL;
}
- r = sd_event_
new
(&m->event);
+ r = sd_event_
default
(&m->event);
if (r < 0) {
manager_free(m);
return NULL;
if (r < 0) {
manager_free(m);
return NULL;
@@
-177,7
+177,7
@@
void manager_free(Manager *m) {
free(m);
}
free(m);
}
-int manager_enumerate_devices(Manager *m) {
+
static
int manager_enumerate_devices(Manager *m) {
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_enumerate *e;
int r;
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_enumerate *e;
int r;
@@
-226,7
+226,7
@@
finish:
return r;
}
return r;
}
-int manager_enumerate_buttons(Manager *m) {
+
static
int manager_enumerate_buttons(Manager *m) {
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_enumerate *e;
int r;
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_enumerate *e;
int r;
@@
-284,7
+284,7
@@
finish:
return r;
}
return r;
}
-int manager_enumerate_seats(Manager *m) {
+
static
int manager_enumerate_seats(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
@@
-357,7
+357,7
@@
static int manager_enumerate_linger_users(Manager *m) {
return r;
}
return r;
}
-int manager_enumerate_users(Manager *m) {
+
static
int manager_enumerate_users(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r, k;
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r, k;
@@
-401,7
+401,7
@@
int manager_enumerate_users(Manager *m) {
return r;
}
return r;
}
-int manager_enumerate_sessions(Manager *m) {
+
static
int manager_enumerate_sessions(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
@@
-449,7
+449,7
@@
int manager_enumerate_sessions(Manager *m) {
return r;
}
return r;
}
-int manager_enumerate_inhibitors(Manager *m) {
+
static
int manager_enumerate_inhibitors(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
@@
-605,7
+605,7
@@
static int manager_connect_bus(Manager *m) {
assert(m);
assert(!m->bus);
assert(m);
assert(!m->bus);
- r = sd_bus_
open
_system(&m->bus);
+ r = sd_bus_
default
_system(&m->bus);
if (r < 0) {
log_error("Failed to connect to system bus: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to connect to system bus: %s", strerror(-r));
return r;
@@
-958,7
+958,7
@@
static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us
return r;
}
return r;
}
- r = sd_event_source_set_priority(m->idle_action_event_source, SD_PRIORITY_IDLE+10);
+ r = sd_event_source_set_priority(m->idle_action_event_source, SD_
EVENT_
PRIORITY_IDLE+10);
if (r < 0) {
log_error("Failed to set idle event source priority: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to set idle event source priority: %s", strerror(-r));
return r;