X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-server.c;h=0e65ee782a45bce38ccde6c00a52f3d65091f79e;hb=79f8d3d2ce51e992493f2d354a5764262c9d564a;hp=478a81e5cb3943a1b916e79f08c28980c1089739;hpb=40ca29a1370379d43e44c0ed425eecc7218dcbca;p=elogind.git

diff --git a/src/libsystemd-bus/test-bus-server.c b/src/libsystemd-bus/test-bus-server.c
index 478a81e5c..0e65ee782 100644
--- a/src/libsystemd-bus/test-bus-server.c
+++ b/src/libsystemd-bus/test-bus-server.c
@@ -88,7 +88,7 @@ static void *server(void *p) {
 
                         assert_se((sd_bus_can_send(bus, 'h') >= 1) == (c->server_negotiate_unix_fds && c->client_negotiate_unix_fds));
 
-                        r = sd_bus_message_new_method_return(bus, m, &reply);
+                        r = sd_bus_message_new_method_return(m, &reply);
                         if (r < 0) {
                                 log_error("Failed to allocate return: %s", strerror(-r));
                                 goto fail;
@@ -98,8 +98,8 @@ static void *server(void *p) {
 
                 } else if (sd_bus_message_is_method_call(m, NULL, NULL)) {
                         r = sd_bus_message_new_method_error(
-                                        bus, m,
-                                        &SD_BUS_ERROR_MAKE(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."),
+                                        m,
+                                        &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."),
                                         &reply);
                         if (r < 0) {
                                 log_error("Failed to allocate return: %s", strerror(-r));
@@ -151,7 +151,7 @@ static int client(struct context *c) {
                 return r;
         }
 
-        r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, &reply);
+        r = sd_bus_call(bus, m, 0, &error, &reply);
         if (r < 0) {
                 log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
                 return r;