diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-11-04 16:13:49 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-11-04 16:13:49 +0100 |
commit | 455971c1493fc6dc3125d235cf4ea6102cac626d (patch) | |
tree | 4fe3367db4487eebbbffb2516d757fdddf07efba /src/libsystemd/sd-bus/sd-bus.c | |
parent | 635f9f0d95d1cc460f2c59a8fe26ecc358420544 (diff) |
sd-bus: rename "connection name" to "description" for the sd-bus API too
kdbus recently renamed this concept, and so should we in what we expose
in userspace.
Diffstat (limited to 'src/libsystemd/sd-bus/sd-bus.c')
-rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 03ec6036fa..318cf6bae5 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -129,7 +129,7 @@ static void bus_free(sd_bus *b) { free(b->machine); free(b->fake_label); free(b->cgroup_root); - free(b->connection_name); + free(b->description); free(b->exec_path); strv_free(b->exec_argv); @@ -323,20 +323,20 @@ _public_ int sd_bus_set_trusted(sd_bus *bus, int b) { return 0; } -_public_ int sd_bus_set_name(sd_bus *bus, const char *name) { +_public_ int sd_bus_set_description(sd_bus *bus, const char *description) { char *n; assert_return(bus, -EINVAL); - assert_return(name, -EINVAL); + assert_return(description, -EINVAL); assert_return(bus->state == BUS_UNSET, -EPERM); assert_return(!bus_pid_changed(bus), -ECHILD); - n = strdup(name); + n = strdup(description); if (!n) return -ENOMEM; - free(bus->connection_name); - bus->connection_name = n; + free(bus->description); + bus->description = n; return 0; } @@ -3322,12 +3322,12 @@ _public_ int sd_bus_try_close(sd_bus *bus) { return 0; } -_public_ int sd_bus_get_name(sd_bus *bus, const char **name) { +_public_ int sd_bus_get_description(sd_bus *bus, const char **description) { assert_return(bus, -EINVAL); - assert_return(name, -EINVAL); + assert_return(description, -EINVAL); assert_return(!bus_pid_changed(bus), -ECHILD); - *name = bus->connection_name; + *description = bus->description; return 0; } |