diff options
| author | Daniel Mack <daniel@zonque.org> | 2014-11-04 12:08:36 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2014-11-04 12:44:53 +0100 |
| commit | 635f9f0d95d1cc460f2c59a8fe26ecc358420544 (patch) | |
| tree | 4f3c144e16fed80a51f29746cff4d6257bd15818 /src/libsystemd/sd-bus/bus-control.c | |
| parent | dfb05a1cf5479e6949d2413a633431c64d006ff2 (diff) | |
sd-bus: sync kdbus.h (ABI break)
Catch up with some changes in kdbus.h:
* KDBUS_{ITEM,ATTACH}_CONN_NAME were renamed to
KDBUS_{ITEM,ATTACH}_CONN_DESCRIPTION, so the term 'name' is not
overloaded as much.
* The item types were re-ordered a little so they are lined up to the
order of the corresponding KDBUS_ATTACH flags
* A new item type KDBUS_ITEM_OWNED_NAME was introduced, designated to
store a struct kdbus_name in item->name. KDBUS_ITEM_NAME soley
stores data in item->str now
* Some kerneldoc fixes
Diffstat (limited to 'src/libsystemd/sd-bus/bus-control.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 5a052d455e..5f57283c27 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -278,8 +278,8 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { } KDBUS_ITEM_FOREACH(item, name, items) - if (item->type == KDBUS_ITEM_NAME) - entry_name = item->str; + if (item->type == KDBUS_ITEM_OWNED_NAME) + entry_name = item->name.name; if (entry_name && service_name_is_valid(entry_name)) { r = strv_extend(x, entry_name); @@ -524,7 +524,7 @@ static int bus_populate_creds_from_items(sd_bus *bus, } break; - case KDBUS_ITEM_NAME: + case KDBUS_ITEM_OWNED_NAME: if ((mask & SD_BUS_CREDS_WELL_KNOWN_NAMES) && service_name_is_valid(item->name.name)) { r = strv_extend(&c->well_known_names, item->name.name); if (r < 0) @@ -534,7 +534,7 @@ static int bus_populate_creds_from_items(sd_bus *bus, } break; - case KDBUS_ITEM_CONN_NAME: + case KDBUS_ITEM_CONN_DESCRIPTION: if ((mask & SD_BUS_CREDS_CONNECTION_NAME)) { c->conn_name = strdup(item->str); if (!c->conn_name) |