chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: drop bus/message GC logic
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-control.c
diff --git
a/src/libsystemd/sd-bus/bus-control.c
b/src/libsystemd/sd-bus/bus-control.c
index bd392a2937559902c9b295a8d2661b472eab82f1..076bbce6b1a2c8438eb746cf8907fa5c4169b868 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-control.c
+++ b/
src/libsystemd/sd-bus/bus-control.c
@@
-395,7
+395,7
@@
static int bus_get_owner_kdbus(
/* Non-activated names are considered not available */
if (conn_info->flags & KDBUS_HELLO_ACTIVATOR)
/* Non-activated names are considered not available */
if (conn_info->flags & KDBUS_HELLO_ACTIVATOR)
- return name[0] == ':' ? -ENXIO : -E
NOENT
;
+ return name[0] == ':' ? -ENXIO : -E
SRCH
;
c = bus_creds_new();
if (!c)
c = bus_creds_new();
if (!c)
@@
-925,7
+925,6
@@
static int add_name_change_match(sd_bus *bus,
int bus_add_match_internal_kernel(
sd_bus *bus,
int bus_add_match_internal_kernel(
sd_bus *bus,
- uint64_t id,
struct bus_match_component *components,
unsigned n_components,
uint64_t cookie) {
struct bus_match_component *components,
unsigned n_components,
uint64_t cookie) {
@@
-1063,7
+1062,6
@@
int bus_add_match_internal_kernel(
m = alloca0(sz);
m->size = sz;
m->cookie = cookie;
m = alloca0(sz);
m->size = sz;
m->cookie = cookie;
- m->owner_id = id;
item = m->items;
item = m->items;
@@
-1142,17
+1140,15
@@
int bus_add_match_internal(
uint64_t cookie) {
assert(bus);
uint64_t cookie) {
assert(bus);
- assert(match);
if (bus->is_kernel)
if (bus->is_kernel)
- return bus_add_match_internal_kernel(bus,
0,
components, n_components, cookie);
+ return bus_add_match_internal_kernel(bus, components, n_components, cookie);
else
return bus_add_match_internal_dbus1(bus, match);
}
int bus_remove_match_internal_kernel(
sd_bus *bus,
else
return bus_add_match_internal_dbus1(bus, match);
}
int bus_remove_match_internal_kernel(
sd_bus *bus,
- uint64_t id,
uint64_t cookie) {
struct kdbus_cmd_match m;
uint64_t cookie) {
struct kdbus_cmd_match m;
@@
-1163,7
+1159,6
@@
int bus_remove_match_internal_kernel(
zero(m);
m.size = offsetof(struct kdbus_cmd_match, items);
m.cookie = cookie;
zero(m);
m.size = offsetof(struct kdbus_cmd_match, items);
m.cookie = cookie;
- m.owner_id = id;
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_REMOVE, &m);
if (r < 0)
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_REMOVE, &m);
if (r < 0)
@@
-1201,10
+1196,9
@@
int bus_remove_match_internal(
uint64_t cookie) {
assert(bus);
uint64_t cookie) {
assert(bus);
- assert(match);
if (bus->is_kernel)
if (bus->is_kernel)
- return bus_remove_match_internal_kernel(bus,
0,
cookie);
+ return bus_remove_match_internal_kernel(bus, cookie);
else
return bus_remove_match_internal_dbus1(bus, match);
}
else
return bus_remove_match_internal_dbus1(bus, match);
}