picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-bus: the bus returned should be the first arg 

This matches the API of previous headers, such as sd-journal.h.
This commit is contained in:
Jason A. Donenfeld 2014-02-18 19:11:08 +01:00 committed by Lennart Poettering
parent e51660ae56
commit 3db729cb8e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd/sd-bus/bus-util.c
View File

@ -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:

4
src/libsystemd/sd-bus/sd-bus.c
View File

@ -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;

2
src/machine/machinectl.c
View File

@ -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;

4
src/systemd/sd-bus.h
View File

@ -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);