diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-02-18 19:11:08 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-02-20 00:03:09 +0100 |
| commit | 3db729cb8e6822114e9323f4041dcdc080f2fb3c (patch) | |
| tree | d392f66240c14bb102569cea7977fb3b293b91c3 | |
| parent | e51660ae56bb747ece2cab8fe6eec37f4d06a438 (diff) | |
sd-bus: the bus returned should be the first arg
This matches the API of previous headers, such as sd-journal.h.
| -rw-r--r-- | src/libsystemd/sd-bus/bus-util.c | 8 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 4 | ||||
| -rw-r--r-- | src/machine/machinectl.c | 2 | ||||
| -rw-r--r-- | src/systemd/sd-bus.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c index a468bcad6b..8a6a70c60e 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1054,11 +1054,11 @@ int bus_open_transport(BusTransport transport, const char *host, bool user, sd_b break; case BUS_TRANSPORT_REMOTE: - r = sd_bus_open_system_remote(host, bus); + r = sd_bus_open_system_remote(bus, host); break; case BUS_TRANSPORT_CONTAINER: - r = sd_bus_open_system_container(host, bus); + r = sd_bus_open_system_container(bus, host); break; default: @@ -1089,11 +1089,11 @@ int bus_open_transport_systemd(BusTransport transport, const char *host, bool us break; case BUS_TRANSPORT_REMOTE: - r = sd_bus_open_system_remote(host, bus); + r = sd_bus_open_system_remote(bus, host); break; case BUS_TRANSPORT_CONTAINER: - r = sd_bus_open_system_container(host, bus); + r = sd_bus_open_system_container(bus, host); break; default: diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index e494cd2ba9..a97fcf5823 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -1214,7 +1214,7 @@ fail: return r; } -_public_ int sd_bus_open_system_remote(const char *host, sd_bus **ret) { +_public_ int sd_bus_open_system_remote(sd_bus **ret, const char *host) { _cleanup_free_ char *e = NULL; char *p = NULL; sd_bus *bus; @@ -1250,7 +1250,7 @@ _public_ int sd_bus_open_system_remote(const char *host, sd_bus **ret) { return 0; } -_public_ int sd_bus_open_system_container(const char *machine, sd_bus **ret) { +_public_ int sd_bus_open_system_container(sd_bus **ret, const char *machine) { _cleanup_free_ char *e = NULL; sd_bus *bus; char *p; diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index de79996141..32f862d093 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -620,7 +620,7 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) { return -EIO; } - r = sd_bus_open_system_container(args[1], &container_bus); + r = sd_bus_open_system_container(&container_bus, args[1]); if (r < 0) { log_error("Failed to get container bus: %s", strerror(-r)); return r; diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 34d426321e..94a435ac6d 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -102,8 +102,8 @@ int sd_bus_default_system(sd_bus **ret); int sd_bus_open(sd_bus **ret); int sd_bus_open_user(sd_bus **ret); int sd_bus_open_system(sd_bus **ret); -int sd_bus_open_system_remote(const char *host, sd_bus **ret); -int sd_bus_open_system_container(const char *machine, sd_bus **ret); +int sd_bus_open_system_remote(sd_bus **ret, const char *host); +int sd_bus_open_system_container(sd_bus **ret, const char *machine); int sd_bus_new(sd_bus **ret); int sd_bus_set_address(sd_bus *bus, const char *address); |