X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-server.c;h=a9db1f410193f4e59066a69b55426b447a67fc63;hb=718db96199eb307751264e4163555662c9a389fa;hp=ef26a65d87023259b9b30bc90002a77d0fcdc882;hpb=264ad849a4a0acf1ca392da62b7018d4fe7b66b3;p=elogind.git diff --git a/src/libsystemd-bus/test-bus-server.c b/src/libsystemd-bus/test-bus-server.c index ef26a65d8..a9db1f410 100644 --- a/src/libsystemd-bus/test-bus-server.c +++ b/src/libsystemd-bus/test-bus-server.c @@ -32,6 +32,7 @@ #include "sd-bus.h" #include "bus-internal.h" #include "bus-message.h" +#include "bus-util.h" struct context { int fds[2]; @@ -98,7 +99,7 @@ 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("org.freedesktop.DBus.Error.UnknownMethod", "Unknown method."), + &SD_BUS_ERROR_MAKE(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."), &reply); if (r < 0) { log_error("Failed to allocate return: %s", strerror(-r)); @@ -150,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;