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: catch up with latest kdbus changes
[elogind.git]
/
src
/
libsystemd-bus
/
bus-control.c
diff --git
a/src/libsystemd-bus/bus-control.c
b/src/libsystemd-bus/bus-control.c
index 186724e8ad1f7723ef48cb5986028eb3bba89312..966398944f9799edd23e8205f84fcef1ed3a468e 100644
(file)
--- a/
src/libsystemd-bus/bus-control.c
+++ b/
src/libsystemd-bus/bus-control.c
@@
-216,7
+216,7
@@
static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
name_list = (struct kdbus_name_list *) ((uint8_t *) bus->kdbus_buffer + cmd.offset);
name_list = (struct kdbus_name_list *) ((uint8_t *) bus->kdbus_buffer + cmd.offset);
- KDBUS_
PART
_FOREACH(name, name_list, names) {
+ KDBUS_
ITEM
_FOREACH(name, name_list, names) {
if (name->size > sizeof(*name)) {
r = strv_extend(x, name->name);
if (name->size > sizeof(*name)) {
r = strv_extend(x, name->name);
@@
-383,7
+383,7
@@
static int bus_get_owner_kdbus(
c->mask |= SD_BUS_CREDS_UNIQUE_NAME;
}
c->mask |= SD_BUS_CREDS_UNIQUE_NAME;
}
- KDBUS_
PART
_FOREACH(item, conn_info, items) {
+ KDBUS_
ITEM
_FOREACH(item, conn_info, items) {
switch (item->type) {
switch (item->type) {
@@
-439,7
+439,7
@@
static int bus_get_owner_kdbus(
case KDBUS_ITEM_CMDLINE:
if (mask & SD_BUS_CREDS_CMDLINE) {
case KDBUS_ITEM_CMDLINE:
if (mask & SD_BUS_CREDS_CMDLINE) {
- c->cmdline_size = item->size - KDBUS_
PART
_HEADER_SIZE;
+ c->cmdline_size = item->size - KDBUS_
ITEM
_HEADER_SIZE;
c->cmdline = memdup(item->data, c->cmdline_size);
if (!c->cmdline) {
r = -ENOMEM;
c->cmdline = memdup(item->data, c->cmdline_size);
if (!c->cmdline) {
r = -ENOMEM;
@@
-471,7
+471,7
@@
static int bus_get_owner_kdbus(
SD_BUS_CREDS_INHERITABLE_CAPS | SD_BUS_CREDS_BOUNDING_CAPS) & mask;
if (m) {
SD_BUS_CREDS_INHERITABLE_CAPS | SD_BUS_CREDS_BOUNDING_CAPS) & mask;
if (m) {
- c->capability_size = item->size - KDBUS_
PART
_HEADER_SIZE;
+ c->capability_size = item->size - KDBUS_
ITEM
_HEADER_SIZE;
c->capability = memdup(item->data, c->capability_size);
if (!c->capability) {
r = -ENOMEM;
c->capability = memdup(item->data, c->capability_size);
if (!c->capability) {
r = -ENOMEM;
@@
-1010,7
+1010,7
@@
static int bus_add_match_internal_kernel(
item->type = KDBUS_MATCH_BLOOM;
memcpy(item->data64, bloom, BLOOM_SIZE);
item->type = KDBUS_MATCH_BLOOM;
memcpy(item->data64, bloom, BLOOM_SIZE);
- item = KDBUS_
PART
_NEXT(item);
+ item = KDBUS_
ITEM
_NEXT(item);
}
if (sender) {
}
if (sender) {