shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

sd-bus: sync kdbus.h (API break)

Browse Source 
Just a rename of two struct members to make the header file c++ compatible.
This commit is contained in:
Daniel Mack 2014-09-23 16:13:54 +02:00
parent e78af5ffe5
commit 619d7a039f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd/sd-bus/bus-control.c
View File

@ -851,8 +851,8 @@ static int add_name_change_match(sd_bus *bus,
offsetof(struct kdbus_notify_name_change, name) +
l;
item->name_change.old.id = old_owner_id;
item->name_change.new.id = new_owner_id;
item->name_change.old_id.id = old_owner_id;
item->name_change.new_id.id = new_owner_id;
if (name)
memcpy(item->name_change.name, name, l);

8
src/libsystemd/sd-bus/bus-kernel.c
View File

@ -950,19 +950,19 @@ static int translate_name_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_
assert(k);
assert(d);
if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR)))
if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR)))
old_owner[0] = 0;
else
sprintf(old_owner, ":1.%llu", (unsigned long long) d->name_change.old.id);
sprintf(old_owner, ":1.%llu", (unsigned long long) d->name_change.old_id.id);
if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) {
if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new_id.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) {
if (isempty(old_owner))
return 0;
new_owner[0] = 0;
} else
sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new.id);
sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new_id.id);
return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner);
}

6
src/libsystemd/sd-bus/kdbus.h
View File

@ -46,7 +46,7 @@ struct kdbus_notify_id_change {
/**
* struct kdbus_notify_name_change - name registry change message
* @old: ID and flags of former owner of a name
* @new: ID and flags of new owner of a name
* @now: ID and flags of new owner of a name
* @name: Well-known name
*
* Sent from kernel to userspace when the owner or activator of
@ -58,8 +58,8 @@ struct kdbus_notify_id_change {
* KDBUS_ITEM_NAME_CHANGE
*/
struct kdbus_notify_name_change {
struct kdbus_notify_id_change old;
struct kdbus_notify_id_change new;
struct kdbus_notify_id_change old_id;
struct kdbus_notify_id_change new_id;
char name[0];
};