From f7fce3454c221fd1fff51528d028576d1cb1c7b6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 4 Nov 2014 17:24:30 +0100 Subject: sd-bus: rename sd_bus_get_server_id() to sd_bus_get_owner_id() In kdbus a "server id" is mostly a misnomer, as there isn't any "server" involved anymore. Let's rename this to "owner" id hence, since it is an ID that is picked by the owner of a bus or direct connection. This matches nicely the sd_bus_get_owner_creds() call we already have. --- src/libsystemd/sd-bus/sd-bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsystemd/sd-bus/sd-bus.c') diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index a3165fb4f7..e6b47f7fd8 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -1412,18 +1412,18 @@ _public_ int sd_bus_can_send(sd_bus *bus, char type) { return bus_type_is_valid(type); } -_public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { +_public_ int sd_bus_get_owner_id(sd_bus *bus, sd_id128_t *id) { int r; assert_return(bus, -EINVAL); - assert_return(server_id, -EINVAL); + assert_return(id, -EINVAL); assert_return(!bus_pid_changed(bus), -ECHILD); r = bus_ensure_running(bus); if (r < 0) return r; - *server_id = bus->server_id; + *id = bus->server_id; return 0; } -- cgit v1.2.3-54-g00ecf