diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-12-18 20:45:35 +0100 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2018-05-30 07:49:57 +0200 |
commit | c1d0289f0036eac5fdf47997d516764be75219f4 (patch) | |
tree | 0a8bcdda220d82d31586dace9a7c017f144b7aaf /src/libelogind/sd-bus | |
parent | f92d561e1eeaa447aa4812e8e5e85e009fe5d4e3 (diff) |
sd-bus: remove bus_remove_match_by_string() helper which is unused
Diffstat (limited to 'src/libelogind/sd-bus')
-rw-r--r-- | src/libelogind/sd-bus/bus-internal.h | 2 | ||||
-rw-r--r-- | src/libelogind/sd-bus/sd-bus.c | 31 |
2 files changed, 0 insertions, 33 deletions
diff --git a/src/libelogind/sd-bus/bus-internal.h b/src/libelogind/sd-bus/bus-internal.h index b0c519cf9..1047125e8 100644 --- a/src/libelogind/sd-bus/bus-internal.h +++ b/src/libelogind/sd-bus/bus-internal.h @@ -401,9 +401,7 @@ int bus_set_address_system_remote(sd_bus *b, const char *host); int bus_set_address_system_machine(sd_bus *b, const char *machine); #if 0 /// UNNEEDED by elogind -int bus_remove_match_by_string(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata); #endif // 0 - int bus_get_root_path(sd_bus *bus); int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error); diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index d90cefd31..a73924b6e 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -3020,38 +3020,7 @@ finish: } #if 0 /// UNNEEDED by elogind -int bus_remove_match_by_string( - sd_bus *bus, - const char *match, - sd_bus_message_handler_t callback, - void *userdata) { - - struct bus_match_component *components = NULL; - unsigned n_components = 0; - struct match_callback *c; - int r = 0; - - assert_return(bus, -EINVAL); - assert_return(match, -EINVAL); - assert_return(!bus_pid_changed(bus), -ECHILD); - - r = bus_match_parse(match, &components, &n_components); - if (r < 0) - goto finish; - - r = bus_match_find(&bus->match_callbacks, components, n_components, NULL, NULL, &c); - if (r <= 0) - goto finish; - - sd_bus_slot_unref(container_of(c, sd_bus_slot, match_callback)); - -finish: - bus_match_parse_free(components, n_components); - - return r; -} #endif // 0 - bool bus_pid_changed(sd_bus *bus) { assert(bus); |