chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bring bootchart code in line with CODING_STYLE
[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 ff6a5a6cb613d264efb3f0aefaef1e1f9bc7ed0c..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);
@@
-363,6
+363,7
@@
static int bus_get_owner_kdbus(
cmd = alloca0(size);
strcpy(cmd->name, name);
}
cmd = alloca0(size);
strcpy(cmd->name, name);
}
+ cmd->flags = KDBUS_ATTACH_NAMES;
cmd->size = size;
r = ioctl(bus->input_fd, KDBUS_CMD_CONN_INFO, cmd);
cmd->size = size;
r = ioctl(bus->input_fd, KDBUS_CMD_CONN_INFO, cmd);
@@
-382,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) {
@@
-438,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;
@@
-470,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;
@@
-503,14
+504,11
@@
static int bus_get_owner_kdbus(
}
break;
}
break;
- case KDBUS_ITEM_NAME
S
:
+ case KDBUS_ITEM_NAME:
if (mask & SD_BUS_CREDS_WELL_KNOWN_NAMES) {
if (mask & SD_BUS_CREDS_WELL_KNOWN_NAMES) {
- c->well_known_names_size = item->size - KDBUS_PART_HEADER_SIZE;
- c->well_known_names = memdup(item->data, c->well_known_names_size);
- if (!c->well_known_names) {
- r = -ENOMEM;
+ r = strv_extend(&c->well_known_names, item->name.name);
+ if (r < 0)
goto fail;
goto fail;
- }
c->mask |= SD_BUS_CREDS_WELL_KNOWN_NAMES;
}
c->mask |= SD_BUS_CREDS_WELL_KNOWN_NAMES;
}
@@
-1012,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) {