chiark / gitweb /
sd-bus: drop unused parameters from bus_add_match_internal()
authorLennart Poettering <lennart@poettering.net>
Mon, 18 Dec 2017 19:34:21 +0000 (20:34 +0100)
committerSven Eden <yamakuzure@gmx.net>
Wed, 30 May 2018 05:49:57 +0000 (07:49 +0200)
We don't need the match components anymore, since kdbus is gone, hence
drop it.

src/libelogind/sd-bus/bus-control.c
src/libelogind/sd-bus/bus-control.h
src/libelogind/sd-bus/sd-bus.c

index 403800131844f5f12e065f4b4fdf79a912a98af3..aa247db07f1b475c626f4c4337fa3353991b32f6 100644 (file)
@@ -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;
 
index c9d434c60744d7d299b3b6125973e44589c26068..c4596fa294352d3c8faaefea61bf83c52270e382 100644 (file)
@@ -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);
index 01c4ca012b458bd0f51659eefc07fd04ff162e6b..d90cefd317115962e9df8650ab7ae2f2438c8dbd 100644 (file)
@@ -2995,7 +2995,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;