diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-02-24 12:10:13 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-02-24 12:10:13 +0100 |
| commit | 6ad4a4fc43e12c8c36f85abbb36e8791ec507519 (patch) | |
| tree | bbdb08f632fe9be15e7eae00af5c4f1e5f17ef85 /src/libsystemd/sd-bus/bus-kernel.c | |
| parent | 8527b07be1c5211b50a1a6496585952857a25c73 (diff) | |
sd-bus: sync kdbus.h
Follow two small changes in the kdbus API:
* Flags are now returned in cmd->return_flags by KDBUS_CMD_NAME_ACQUIRE
* struct kdbus_item_list has been dropped. The information stored in
this struct was redundant since awhile already, as all commands
report their returned slice size anyway.
Diffstat (limited to 'src/libsystemd/sd-bus/bus-kernel.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 4333445f2a..9e74530a36 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -840,9 +840,8 @@ fail: int bus_kernel_take_fd(sd_bus *b) { struct kdbus_bloom_parameter *bloom = NULL; + struct kdbus_item *items, *item; struct kdbus_cmd_hello *hello; - struct kdbus_item_list *items; - struct kdbus_item *item; _cleanup_free_ char *g = NULL; const char *name; size_t l = 0, m = 0, sz; @@ -968,7 +967,7 @@ int bus_kernel_take_fd(sd_bus *b) { /* extract bloom parameters from items */ items = (void*)((uint8_t*)b->kdbus_buffer + hello->offset); - KDBUS_ITEM_FOREACH(item, items, items) { + KDBUS_FOREACH(item, items, hello->items_size) { switch (item->type) { case KDBUS_ITEM_BLOOM_PARAMETER: bloom = &item->bloom_parameter; |