From a8d4cac55cf9575d19ff5a1747e726387f5a552f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 6 Dec 2013 14:31:43 +0100 Subject: bus: catch up with latest kdbus changes --- src/libsystemd-bus/bus-kernel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libsystemd-bus/bus-kernel.c') diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index 5ed836eeb0..f234891889 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -462,7 +462,7 @@ static void close_kdbus_msg(sd_bus *bus, struct kdbus_msg *k) { off = (uint8_t *)k - (uint8_t *)bus->kdbus_buffer; ioctl(bus->input_fd, KDBUS_CMD_FREE, &off); - KDBUS_PART_FOREACH(d, k, items) { + KDBUS_ITEM_FOREACH(d, k, items) { if (d->type == KDBUS_ITEM_FDS) close_many(d->fds, (d->size - offsetof(struct kdbus_item, fds)) / sizeof(int)); @@ -589,7 +589,7 @@ static int bus_kernel_translate_message(sd_bus *bus, struct kdbus_msg *k) { assert(k); assert(k->payload_type == KDBUS_PAYLOAD_KERNEL); - KDBUS_PART_FOREACH(d, k, items) { + KDBUS_ITEM_FOREACH(d, k, items) { if (d->type >= _KDBUS_ITEM_KERNEL_BASE && d->type < _KDBUS_ITEM_KERNEL_BASE + ELEMENTSOF(translate)) { if (found) return -EBADMSG; @@ -620,7 +620,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { assert(k); assert(k->payload_type == KDBUS_PAYLOAD_DBUS1); - KDBUS_PART_FOREACH(d, k, items) { + KDBUS_ITEM_FOREACH(d, k, items) { size_t l; l = d->size - offsetof(struct kdbus_item, data); @@ -680,7 +680,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { if (r < 0) return r; - KDBUS_PART_FOREACH(d, k, items) { + KDBUS_ITEM_FOREACH(d, k, items) { size_t l; l = d->size - offsetof(struct kdbus_item, data); -- cgit v1.2.3-54-g00ecf