80 lines
3.4 KiB
Diff
80 lines
3.4 KiB
Diff
From 619d7a039f9f64ffa593634c2715838ffbc17be4 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Mack <daniel@zonque.org>
|
|
Date: Tue, 23 Sep 2014 16:13:54 +0200
|
|
Subject: [PATCH] sd-bus: sync kdbus.h (API break)
|
|
|
|
Just a rename of two struct members to make the header file c++ compatible.
|
|
---
|
|
src/libsystemd/sd-bus/bus-control.c | 4 ++--
|
|
src/libsystemd/sd-bus/bus-kernel.c | 8 ++++----
|
|
src/libsystemd/sd-bus/kdbus.h | 6 +++---
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
|
|
index 50b662f85d..b22f4c4ff6 100644
|
|
--- a/src/libsystemd/sd-bus/bus-control.c
|
|
+++ b/src/libsystemd/sd-bus/bus-control.c
|
|
@@ -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);
|
|
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
|
|
index c30491e687..236e8787b7 100644
|
|
--- a/src/libsystemd/sd-bus/bus-kernel.c
|
|
+++ b/src/libsystemd/sd-bus/bus-kernel.c
|
|
@@ -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);
|
|
}
|
|
diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libsystemd/sd-bus/kdbus.h
|
|
index 0718b8497a..b167c4d00e 100644
|
|
--- a/src/libsystemd/sd-bus/kdbus.h
|
|
+++ b/src/libsystemd/sd-bus/kdbus.h
|
|
@@ -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];
|
|
};
|
|
|