chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: rename sd_bus_get_server_id() to sd_bus_get_owner_id()
[elogind.git]
/
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 a3165fb4f743df7b544d22471022e26ffe2abc6d..e6b47f7fd81a5f47f578d8d1c0fd5ccc194f486c 100644
(file)
--- 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);
}
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);
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;
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;
}
return 0;
}