diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-12-23 19:14:24 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-12-23 19:15:33 +0100 |
| commit | 98531b5762778ed5740e8e7edc4e3790e57e9f37 (patch) | |
| tree | fe500de64ababb5b5fb8268fb58bdcf8593be932 /src/libsystemd-bus/bus-control.c | |
| parent | fbadf04511389c4a0687ba5e9baf0ecebdbb07f1 (diff) | |
bus: update kdbus.h
Diffstat (limited to 'src/libsystemd-bus/bus-control.c')
| -rw-r--r-- | src/libsystemd-bus/bus-control.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c index a38ce0cb60..a8983168ab 100644 --- a/src/libsystemd-bus/bus-control.c +++ b/src/libsystemd-bus/bus-control.c @@ -230,10 +230,10 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { KDBUS_ITEM_FOREACH(name, name_list, names) { - if ((flags & KDBUS_NAME_LIST_UNIQUE) && name->id != previous_id) { + if ((flags & KDBUS_NAME_LIST_UNIQUE) && name->owner_id != previous_id) { char *n; - if (asprintf(&n, ":1.%llu", (unsigned long long) name->id) < 0) + if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) return -ENOMEM; r = strv_push(x, n); @@ -242,7 +242,7 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { return -ENOMEM; } - previous_id = name->id; + previous_id = name->owner_id; } if (name->size > sizeof(*name) && service_name_is_valid(name->name)) { @@ -1023,7 +1023,7 @@ int bus_add_match_internal_kernel( m = alloca0(sz); m->size = sz; m->cookie = cookie; - m->id = id; + m->owner_id = id; item = m->items; item->size = offsetof(struct kdbus_item, id) + sizeof(uint64_t); @@ -1111,7 +1111,7 @@ int bus_remove_match_internal_kernel( zero(m); m.size = offsetof(struct kdbus_cmd_match, items); m.cookie = cookie; - m.id = id; + m.owner_id = id; r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_REMOVE, &m); if (r < 0) |