diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-12-18 20:34:21 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-01-05 13:58:32 +0100 |
commit | 0259b87f5e5d830c05e97cc285c49a33f01cb9f2 (patch) | |
tree | b2493ad5aab9424bd3aa534bf4c19d54e95d1b48 | |
parent | 98c5bbc85dc05c9dbccc1d289000dc554892d0d1 (diff) | |
download | systemd-0259b87f5e5d830c05e97cc285c49a33f01cb9f2.tar.gz |
sd-bus: drop unused parameters from bus_add_match_internal()
We don't need the match components anymore, since kdbus is gone, hence
drop it.
-rw-r--r-- | src/libsystemd/sd-bus/bus-control.c | 4 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/bus-control.h | 4 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 4038001318..aa247db07f 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -814,9 +814,7 @@ _public_ int sd_bus_get_owner_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **r int bus_add_match_internal( sd_bus *bus, - const char *match, - struct bus_match_component *components, - unsigned n_components) { + const char *match) { const char *e; diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/sd-bus/bus-control.h index c9d434c607..c4596fa294 100644 --- a/src/libsystemd/sd-bus/bus-control.h +++ b/src/libsystemd/sd-bus/bus-control.h @@ -22,7 +22,5 @@ #include "sd-bus.h" -#include "bus-match.h" - -int bus_add_match_internal(sd_bus *bus, const char *match, struct bus_match_component *components, unsigned n_components); +int bus_add_match_internal(sd_bus *bus, const char *match); int bus_remove_match_internal(sd_bus *bus, const char *match); diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index d551035cd6..6ef352305a 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -2980,7 +2980,7 @@ _public_ int sd_bus_add_match( goto finish; } - r = bus_add_match_internal(bus, s->match_callback.match_string, components, n_components); + r = bus_add_match_internal(bus, s->match_callback.match_string); if (r < 0) goto finish; |