Two verbs in a function name suck, so let's simplify this a bit.
sd_bus_set_anonymous;
sd_bus_set_trusted;
sd_bus_negotiate_fds;
- sd_bus_negotiate_attach_timestamp;
- sd_bus_negotiate_attach_creds;
+ sd_bus_negotiate_timestamp;
+ sd_bus_negotiate_creds;
sd_bus_start;
sd_bus_close;
sd_bus_try_close;
return 0;
}
-_public_ int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b) {
+_public_ int sd_bus_negotiate_timestamp(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
return 0;
}
-_public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t mask) {
+_public_ int sd_bus_negotiate_creds(sd_bus *bus, uint64_t mask) {
assert_return(bus, -EINVAL);
assert_return(mask <= _SD_BUS_CREDS_ALL, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
r = sd_bus_set_address(b, address);
assert_se(r >= 0);
- assert_se(sd_bus_negotiate_attach_timestamp(a, 1) >= 0);
- assert_se(sd_bus_negotiate_attach_creds(a, _SD_BUS_CREDS_ALL) >= 0);
+ assert_se(sd_bus_negotiate_timestamp(a, 1) >= 0);
+ assert_se(sd_bus_negotiate_creds(a, _SD_BUS_CREDS_ALL) >= 0);
- assert_se(sd_bus_negotiate_attach_timestamp(b, 1) >= 0);
- assert_se(sd_bus_negotiate_attach_creds(b, _SD_BUS_CREDS_ALL) >= 0);
+ assert_se(sd_bus_negotiate_timestamp(b, 1) >= 0);
+ assert_se(sd_bus_negotiate_creds(b, _SD_BUS_CREDS_ALL) >= 0);
r = sd_bus_start(a);
assert_se(r >= 0);
int sd_bus_set_anonymous(sd_bus *bus, int b);
int sd_bus_set_trusted(sd_bus *bus, int b);
int sd_bus_negotiate_fds(sd_bus *bus, int b);
-int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b);
-int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t creds_mask);
+int sd_bus_negotiate_timestamp(sd_bus *bus, int b);
+int sd_bus_negotiate_creds(sd_bus *bus, uint64_t creds_mask);
int sd_bus_start(sd_bus *ret);
int sd_bus_try_close(sd_bus *bus);