chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: make sure %m resolves to the specified error in bus_error_set_errnofv()
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-track.c
diff --git
a/src/libsystemd/sd-bus/bus-track.c
b/src/libsystemd/sd-bus/bus-track.c
index 0a3322a4ee9859251c65af766371fbf97a128e86..6be8310bbe02655b65cb0c022816032747f10c6a 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-track.c
+++ b/
src/libsystemd/sd-bus/bus-track.c
@@
-188,7
+188,7
@@
_public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {
/* Second, check if it is currently existing, or maybe
* doesn't, or maybe disappeared already. */
/* Second, check if it is currently existing, or maybe
* doesn't, or maybe disappeared already. */
- r = sd_bus_get_
owner
(track->bus, n, 0, NULL);
+ r = sd_bus_get_
name_creds
(track->bus, n, 0, NULL);
if (r < 0) {
hashmap_remove(track->names, n);
return r;
if (r < 0) {
hashmap_remove(track->names, n);
return r;
@@
-245,7
+245,7
@@
_public_ const char* sd_bus_track_first(sd_bus_track *track) {
return NULL;
track->modified = false;
return NULL;
track->modified = false;
- track->iterator =
NULL
;
+ track->iterator =
ITERATOR_FIRST
;
hashmap_iterate(track->names, &track->iterator, (const void**) &n);
return n;
hashmap_iterate(track->names, &track->iterator, (const void**) &n);
return n;
@@
-309,7
+309,7
@@
void bus_track_dispatch(sd_bus_track *track) {
r = track->handler(track, track->userdata);
if (r < 0)
r = track->handler(track, track->userdata);
if (r < 0)
- log_debug
("Failed to process track handler: %s", strerror(-r)
);
+ log_debug
_errno(r, "Failed to process track handler: %m"
);
else if (r == 0)
bus_track_add_to_queue(track);
else if (r == 0)
bus_track_add_to_queue(track);