SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This matches the API of previous headers, such as sd-journal.h.
This commit is contained in:
Jason A. Donenfeld
2014-02-20 00:03:09 +01:00
committed by Lennart Poettering
parent e51660ae56
commit 3db729cb8e
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/bus-util.c
+4 -4
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:
src/libsystemd/sd-bus/sd-bus.c
+2 -2
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;