diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-01-22 11:21:51 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-01-22 11:21:51 +0100 |
| commit | 4fc319887efb4c68ec5a308d583a94510382f686 (patch) | |
| tree | 8c10a4abaf3dd4b8ba4ffcf4884b75e84fe2b009 | |
| parent | 6a0e376c1cd303ff09777e5d18f070fe43e6b915 (diff) | |
bus: simplify naming of feature negotation calls
Two verbs in a function name suck, so let's simplify this a bit.
| -rw-r--r-- | src/libsystemd/libsystemd.sym | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-kernel.c | 8 | ||||
| -rw-r--r-- | src/systemd/sd-bus.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index 723546ace2..bb3c1ab4af 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -27,8 +27,8 @@ global: 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; diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 2c458f311c..edea7c0ef6 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -284,7 +284,7 @@ _public_ int sd_bus_negotiate_fds(sd_bus *bus, int b) { 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); @@ -293,7 +293,7 @@ _public_ int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b) { 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); diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libsystemd/sd-bus/test-bus-kernel.c index 9b17a35e4a..3dcc5d351d 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/sd-bus/test-bus-kernel.c @@ -65,11 +65,11 @@ int main(int argc, char *argv[]) { 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); diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index fc9a809e39..52627f6557 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -111,8 +111,8 @@ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id); 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); |