diff options
| author | Radoslaw Pajak <r.pajak@samsung.com> | 2013-12-11 14:18:22 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-02-11 11:55:11 +0100 |
| commit | f102c4873a6bc9898a90aed774d72c9bce36ce5b (patch) | |
| tree | ab7d76f7a0ead8f38d06403e2efbe6fcff948d38 | |
| parent | d6522db76cb17700bdb3843b01d5c7b154e50aea (diff) | |
Kdbus merge - Flag KDBUS_NAME_STARTER renamed
Flag KDBUS_NAME_STARTER renamed to KDBUS_NAME_STARTER_NAME in kdbus.
Change-Id: Ia74ff0fdb0a042c5b8aa585c1c91062cfe98e4f0
Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
| -rw-r--r-- | bus/kdbus-d.c | 4 | ||||
| -rw-r--r-- | bus/services.c | 2 | ||||
| -rw-r--r-- | dbus/kdbus-common.c | 4 | ||||
| -rw-r--r-- | dbus/kdbus.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c index e874b433..a19261a6 100644 --- a/bus/kdbus-d.c +++ b/bus/kdbus-d.c @@ -998,13 +998,13 @@ dbus_bool_t register_kdbus_starters(DBusConnection* connection) goto out; #endif - if (request_kdbus_name(fd, services[i], (DBUS_NAME_FLAG_ALLOW_REPLACEMENT | KDBUS_NAME_STARTER) , 0) < 0) + if (request_kdbus_name(fd, services[i], (DBUS_NAME_FLAG_ALLOW_REPLACEMENT | KDBUS_NAME_STARTER_NAME) , 0) < 0) goto out; if(!_dbus_string_append(&name, services[i])) goto out; if(!bus_registry_ensure (bus_connection_get_registry (connection), &name, connection, - (DBUS_NAME_FLAG_ALLOW_REPLACEMENT | KDBUS_NAME_STARTER), transaction, NULL)) + (DBUS_NAME_FLAG_ALLOW_REPLACEMENT | KDBUS_NAME_STARTER_NAME), transaction, NULL)) goto out; if(!_dbus_string_set_length(&name, 0)) goto out; diff --git a/bus/services.c b/bus/services.c index eb45c538..765e85ac 100644 --- a/bus/services.c +++ b/bus/services.c @@ -223,7 +223,7 @@ bus_owner_set_flags (BusOwner *owner, #ifdef ENABLE_KDBUS_TRANSPORT owner->is_kdbus_starter = - (flags & KDBUS_NAME_STARTER) != FALSE; + (flags & KDBUS_NAME_STARTER_NAME) != FALSE; #endif } diff --git a/dbus/kdbus-common.c b/dbus/kdbus-common.c index a4d79f4f..56516968 100644 --- a/dbus/kdbus-common.c +++ b/dbus/kdbus-common.c @@ -169,8 +169,8 @@ int request_kdbus_name(int fd, const char *name, const __u64 flags, __u64 id) flags_kdbus |= KDBUS_NAME_QUEUE; if(flags & DBUS_NAME_FLAG_REPLACE_EXISTING) flags_kdbus |= KDBUS_NAME_REPLACE_EXISTING; - if(flags & KDBUS_NAME_STARTER) - flags_kdbus |= KDBUS_NAME_STARTER; + if(flags & KDBUS_NAME_STARTER_NAME) + flags_kdbus |= KDBUS_NAME_STARTER_NAME; cmd_name->flags = flags_kdbus; cmd_name->id = id; diff --git a/dbus/kdbus.h b/dbus/kdbus.h index b56993c2..13863ac9 100644 --- a/dbus/kdbus.h +++ b/dbus/kdbus.h @@ -555,7 +555,7 @@ enum kdbus_name_flags { KDBUS_NAME_QUEUE = 1 << 1, KDBUS_NAME_ALLOW_REPLACEMENT = 1 << 2, - KDBUS_NAME_STARTER = 1 << 7, + KDBUS_NAME_STARTER_NAME = 1 << 7, /* kernel → userspace */ KDBUS_NAME_IN_QUEUE = 1 << 16, }; |