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: fix timestamp assignment
[elogind.git]
/
src
/
core
/
dbus-client-track.c
diff --git
a/src/core/dbus-client-track.c
b/src/core/dbus-client-track.c
index ce514b577c5a14ac712cb2cfd347f0bd40235ea6..d98f21d46f51f2ec19a6d876d1d9dfd721adca80 100644
(file)
--- a/
src/core/dbus-client-track.c
+++ b/
src/core/dbus-client-track.c
@@
-19,6
+19,7
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "bus-util.h"
#include "dbus-client-track.h"
static unsigned tracked_client_hash(const void *a) {
#include "dbus-client-track.h"
static unsigned tracked_client_hash(const void *a) {
@@
-43,7
+44,7
@@
static int tracked_client_compare(const void *a, const void *b) {
return 0;
}
return 0;
}
-static int on_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int on_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
BusTrackedClient *c = userdata;
const char *name, *old, *new;
int r;
BusTrackedClient *c = userdata;
const char *name, *old, *new;
int r;
@@
-53,8
+54,8
@@
static int on_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *use
r = sd_bus_message_read(message, "sss", &name, &old, &new);
if (r < 0) {
r = sd_bus_message_read(message, "sss", &name, &old, &new);
if (r < 0) {
-
log_debug("Failed to parse NameOwnerChanged message."
);
- return
0
;
+
bus_log_parse_error(r
);
+ return
r
;
}
bus_client_untrack(c->set, bus, name);
}
bus_client_untrack(c->set, bus, name);
@@
-201,9
+202,9
@@
void bus_client_track_serialize(Manager *m, FILE *f, Set *s) {
SET_FOREACH(c, s, i) {
if (c->bus == m->api_bus)
SET_FOREACH(c, s, i) {
if (c->bus == m->api_bus)
- fprintf(f, "subscribed=%s", isempty(c->name) ? "*" : c->name);
+ fprintf(f, "subscribed=%s
\n
", isempty(c->name) ? "*" : c->name);
else
else
- fprintf(f, "subscribed=%p %s", c->bus, isempty(c->name) ? "*" : c->name);
+ fprintf(f, "subscribed=%p %s
\n
", c->bus, isempty(c->name) ? "*" : c->name);
}
}
}
}