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

This matches the API of previous headers, such as sd-journal.h.

diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
index a468bcad6b81dfb7dbd0c02c9c3d1ed72aaba8cb..8a6a70c60e68f83373027fae3e48b6851caf2369 100644 (file)
--- 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:
                 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:
                 break;
 
         case BUS_TRANSPORT_CONTAINER:

-                r = sd_bus_open_system_container(host, bus);
+                r = sd_bus_open_system_container(bus, host);

                 break;
 
         default:
                 break;
 
         default:


@@ -1089,11 +1089,11 @@ int bus_open_transport_systemd(BusTransport transport, const char *host, bool us
                 break;
 
         case BUS_TRANSPORT_REMOTE:
                 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:
                 break;
 
         case BUS_TRANSPORT_CONTAINER:

-                r = sd_bus_open_system_container(host, bus);
+                r = sd_bus_open_system_container(bus, host);

                 break;
 
         default:
                 break;
 
         default:

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index e494cd2ba907636b6b267696b91dced494145e9c..a97fcf5823dcef435ecbe5e1037476cc1ca468c9 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1214,7 +1214,7 @@ fail:
         return r;
 }
 
         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;
         _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;
 }
 
         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;
         _cleanup_free_ char *e = NULL;
         sd_bus *bus;
         char *p;

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index de79996141ac296f81203e5fae944a997da4bc15..32f862d093441b93978c41401c68e2f1be6ad595 100644 (file)
--- 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;
         }
 
                 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;
         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 34d426321e523a72804d95da425cef9faec3f744..94a435ac6d3addbb4d7d23f2fcc7272d030297f0 100644 (file)
--- 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(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);
 
 int sd_bus_new(sd_bus **ret);
 int sd_bus_set_address(sd_bus *bus, const char *address);