summaryrefslogtreecommitdiff
path: root/src/libsystemd/bus-kernel.c
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-01-17 01:29:48 +0100
committerKay Sievers <kay@vrfy.org>2014-01-17 01:42:35 +0100
commit9ff1897bb564bcb885a8e2fd9a73902de830b6e0 (patch)
treecca3956a772706bc485900dfffcafd8faa36726a /src/libsystemd/bus-kernel.c
parent5d8364b3c5e06b8dbda75c07fdb707148dfd1656 (diff)
bus: update kdbus.h (ABI break)
Diffstat (limited to 'src/libsystemd/bus-kernel.c')
-rw-r--r--src/libsystemd/bus-kernel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd/bus-kernel.c b/src/libsystemd/bus-kernel.c
index d69d6f3bc4..d3eeb52425 100644
--- a/src/libsystemd/bus-kernel.c
+++ b/src/libsystemd/bus-kernel.c
@@ -947,8 +947,8 @@ fail:
}
int bus_kernel_read_message(sd_bus *bus) {
+ struct kdbus_cmd_recv recv = {};
struct kdbus_msg *k;
- uint64_t off;
int r;
assert(bus);
@@ -957,14 +957,14 @@ int bus_kernel_read_message(sd_bus *bus) {
if (r < 0)
return r;
- r = ioctl(bus->input_fd, KDBUS_CMD_MSG_RECV, &off);
+ r = ioctl(bus->input_fd, KDBUS_CMD_MSG_RECV, &recv);
if (r < 0) {
if (errno == EAGAIN)
return 0;
return -errno;
}
- k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + off);
+ k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + recv.offset);
if (k->payload_type == KDBUS_PAYLOAD_DBUS) {
r = bus_kernel_make_message(bus, k);