From 966c66e34940001a40806142ecebaae61b478444 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 29 Apr 2015 19:10:09 +0200 Subject: tree-wide: get rid of a few more explicit bus parameters --- src/resolve/resolved-bus.c | 6 +++--- src/resolve/resolved-dns-query.c | 4 ++-- src/resolve/resolved-dns-query.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/resolve') diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 0ea585e197..171141e3a4 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -339,7 +339,7 @@ static int bus_method_resolve_hostname(sd_bus_message *message, void *userdata, q->request_hostname = hostname; q->complete = bus_method_resolve_hostname_complete; - r = dns_query_bus_track(q, sd_bus_message_get_bus(message), message); + r = dns_query_bus_track(q, message); if (r < 0) return r; @@ -491,7 +491,7 @@ static int bus_method_resolve_address(sd_bus_message *message, void *userdata, s memcpy(&q->request_address, d, sz); q->complete = bus_method_resolve_address_complete; - r = dns_query_bus_track(q, sd_bus_message_get_bus(message), message); + r = dns_query_bus_track(q, message); if (r < 0) return r; @@ -643,7 +643,7 @@ static int bus_method_resolve_record(sd_bus_message *message, void *userdata, sd q->request_hostname = name; q->complete = bus_method_resolve_record_complete; - r = dns_query_bus_track(q, sd_bus_message_get_bus(message), message); + r = dns_query_bus_track(q, message); if (r < 0) return r; diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index d619fae725..418d9721ef 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -467,14 +467,14 @@ static int on_bus_track(sd_bus_track *t, void *userdata) { return 0; } -int dns_query_bus_track(DnsQuery *q, sd_bus *bus, sd_bus_message *m) { +int dns_query_bus_track(DnsQuery *q, sd_bus_message *m) { int r; assert(q); assert(m); if (!q->bus_track) { - r = sd_bus_track_new(bus, &q->bus_track, on_bus_track, q); + r = sd_bus_track_new(sd_bus_message_get_bus(m), &q->bus_track, on_bus_track, q); if (r < 0) return r; } diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h index 788992e679..5a319f0a62 100644 --- a/src/resolve/resolved-dns-query.h +++ b/src/resolve/resolved-dns-query.h @@ -75,6 +75,6 @@ void dns_query_ready(DnsQuery *q); int dns_query_cname_redirect(DnsQuery *q, const char *name); -int dns_query_bus_track(DnsQuery *q, sd_bus *bus, sd_bus_message *m); +int dns_query_bus_track(DnsQuery *q, sd_bus_message *m); DEFINE_TRIVIAL_CLEANUP_FUNC(DnsQuery*, dns_query_free); -- cgit v1.2.3-54-g00ecf