summaryrefslogtreecommitdiff
path: root/src/core/busname.c
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-01-12 18:15:18 +0100
committerDaniel Mack <daniel@zonque.org>2015-01-12 18:15:45 +0100
commita9c8343e83ec09f80a76930573b2592f97ae4283 (patch)
tree9ccc2ed72a44ff3f4efe9292fdf5484f1c05b925 /src/core/busname.c
parent0c47569ac9eb365ebeb9342f47fb98d52bcc4704 (diff)
sd-bus: sync kdbus.h (API break)
Just a simple variable rename, and a dropped flag that sd-bus didn't make use of.
Diffstat (limited to 'src/core/busname.c')
-rw-r--r--src/core/busname.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/busname.c b/src/core/busname.c
index 9ab95569eb..00e56686e5 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -770,9 +770,9 @@ static int busname_peek_message(BusName *n) {
* longer than necessary. */
ps = page_size();
- start = (cmd_recv.reply.offset / ps) * ps;
- delta = cmd_recv.reply.offset - start;
- sz = PAGE_ALIGN(delta + cmd_recv.reply.msg_size);
+ start = (cmd_recv.msg.offset / ps) * ps;
+ delta = cmd_recv.msg.offset - start;
+ sz = PAGE_ALIGN(delta + cmd_recv.msg.msg_size);
p = mmap(NULL, sz, PROT_READ, MAP_SHARED, n->starter_fd, start);
if (p == MAP_FAILED) {
@@ -804,7 +804,7 @@ finish:
if (p)
(void) munmap(p, sz);
- cmd_free.offset = cmd_recv.reply.offset;
+ cmd_free.offset = cmd_recv.msg.offset;
if (ioctl(n->starter_fd, KDBUS_CMD_FREE, &cmd_free) < 0)
log_unit_warning(UNIT(n)->id, "Failed to free peeked message, ignoring: %m");