Revert "sd-bus: drop unused parameters from bus_add_match_internal()"

This reverts commit 0259b87f5e5d830c05e97cc285c49a33f01cb9f2.

Change-Id: Ib1c602f12754d5b5a71e1f69bca596514df9512d

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index 77592e8..81b4fed 100644 (file)
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -840,6 +840,8 @@ _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,
                 uint64_t cookie) {
 
         const char *e;
@@ -850,7 +852,7 @@ int bus_add_match_internal(
                 return -EINVAL;
 
         if (bus->is_kernel)
-                return bus_add_match_internal_kernel(bus, NULL, 0, cookie);
+                return bus_add_match_internal_kernel(bus, components, n_components, cookie);
 
         e = append_eavesdrop(bus, match);
 

diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/sd-bus/bus-control.h
index cdc96c1..f5659cd 100644 (file)
--- a/src/libsystemd/sd-bus/bus-control.h
+++ b/src/libsystemd/sd-bus/bus-control.h
@@ -21,7 +21,8 @@
 ***/
 
 #include "sd-bus.h"
+#include "bus-match.h"
 
-int bus_add_match_internal(sd_bus *bus, const char *match, uint64_t cookie);
+int bus_add_match_internal(sd_bus *bus, const char *match, struct bus_match_component *components, unsigned n_components, uint64_t cookie);
 int bus_add_match_internal_async(sd_bus *bus, sd_bus_slot **ret, const char *match, sd_bus_message_handler_t callback, void *userdata);
 int bus_remove_match_internal(sd_bus *bus, const char *match, uint64_t cookie);

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index c280c8a..a1cda86 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -3448,7 +3448,7 @@ static int bus_add_match_full(
                                                                  add_match_callback,
                                                                  s);
                         else
-                                r = bus_add_match_internal(bus, s->match_callback.match_string, s->match_callback.cookie);
+                                r = bus_add_match_internal(bus, s->match_callback.match_string, components, n_components, s->match_callback.cookie);
                         if (r < 0)
                                 goto finish;