chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd-wait-online: flush monitor events after processing
[elogind.git]
/
src
/
core
/
dbus.c
diff --git
a/src/core/dbus.c
b/src/core/dbus.c
index be8dfc90f859eed8d488816473310b22081f0942..e9bf34c49826a8c673857133edb21f30548d9055 100644
(file)
--- a/
src/core/dbus.c
+++ b/
src/core/dbus.c
@@
-918,7
+918,7
@@
static int bus_init_system(Manager *m) {
r = bus_setup_system(m, bus);
if (r < 0) {
r = bus_setup_system(m, bus);
if (r < 0) {
- log_error("Fa
u
iled to set up system bus: %s", strerror(-r));
+ log_error("Failed to set up system bus: %s", strerror(-r));
return 0;
}
return 0;
}
@@
-953,7
+953,7
@@
static int bus_init_private(Manager *m) {
return 0;
strcpy(sa.un.sun_path, "/run/systemd/private");
return 0;
strcpy(sa.un.sun_path, "/run/systemd/private");
- salen = offsetof(union sockaddr_union, un.sun_path) + s
izeof("/run/systemd/private") - 1
;
+ salen = offsetof(union sockaddr_union, un.sun_path) + s
trlen("/run/systemd/private")
;
} else {
size_t left = sizeof(sa.un.sun_path);
char *p = sa.un.sun_path;
} else {
size_t left = sizeof(sa.un.sun_path);
char *p = sa.un.sun_path;
@@
-1086,10
+1086,7
@@
void bus_done(Manager *m) {
if (m->private_listen_event_source)
m->private_listen_event_source = sd_event_source_unref(m->private_listen_event_source);
if (m->private_listen_event_source)
m->private_listen_event_source = sd_event_source_unref(m->private_listen_event_source);
- if (m->private_listen_fd >= 0) {
- close_nointr_nofail(m->private_listen_fd);
- m->private_listen_fd = -1;
- }
+ m->private_listen_fd = safe_close(m->private_listen_fd);
}
int bus_fdset_add_all(Manager *m, FDSet *fds) {
}
int bus_fdset_add_all(Manager *m, FDSet *fds) {
@@
-1163,7
+1160,6
@@
int bus_foreach_bus(
void bus_track_serialize(sd_bus_track *t, FILE *f) {
const char *n;
void bus_track_serialize(sd_bus_track *t, FILE *f) {
const char *n;
- assert(t);
assert(f);
for (n = sd_bus_track_first(t); n; n = sd_bus_track_next(t))
assert(f);
for (n = sd_bus_track_first(t); n; n = sd_bus_track_next(t))