chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: don't attach KDBUS_ITEM_ID to match ioctl() if we don't need it
[elogind.git]
/
src
/
bus-driverd
/
bus-driverd.c
diff --git
a/src/bus-driverd/bus-driverd.c
b/src/bus-driverd/bus-driverd.c
index a420e7fe6702ccecaa771346dfd10f8c36cc01eb..d6dec5dc2a7e85c5f4943ffcb03a3a36fd8875d9 100644
(file)
--- a/
src/bus-driverd/bus-driverd.c
+++ b/
src/bus-driverd/bus-driverd.c
@@
-537,7
+537,7
@@
static int driver_list_queued_owners(sd_bus *bus, sd_bus_message *m, void *userd
if (!streq(name->name, arg0))
continue;
if (!streq(name->name, arg0))
continue;
- 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(&owners, n);
return -ENOMEM;
r = strv_push(&owners, n);
@@
-599,7
+599,7
@@
static int driver_request_name(sd_bus *bus, sd_bus_message *m, void *userdata, s
if (r < 0)
return r;
if (r < 0)
return r;
- n->id = id;
+ n->
owner_
id = id;
r = ioctl(bus->input_fd, KDBUS_CMD_NAME_ACQUIRE, n);
if (r < 0) {
r = ioctl(bus->input_fd, KDBUS_CMD_NAME_ACQUIRE, n);
if (r < 0) {
@@
-642,7
+642,7
@@
static int driver_release_name(sd_bus *bus, sd_bus_message *m, void *userdata, s
if (r < 0)
return r;
if (r < 0)
return r;
- n->id = id;
+ n->
owner_
id = id;
r = ioctl(bus->input_fd, KDBUS_CMD_NAME_RELEASE, n);
if (r < 0) {
r = ioctl(bus->input_fd, KDBUS_CMD_NAME_RELEASE, n);
if (r < 0) {