diff options
Diffstat (limited to 'src/libsystemd-bus')
| -rw-r--r-- | src/libsystemd-bus/bus-convenience.c | 4 | ||||
| -rw-r--r-- | src/libsystemd-bus/bus-util.c | 4 | ||||
| -rw-r--r-- | src/libsystemd-bus/sd-bus.c | 12 | ||||
| -rw-r--r-- | src/libsystemd-bus/test-bus-chat.c | 6 | ||||
| -rw-r--r-- | src/libsystemd-bus/test-bus-kernel-benchmark.c | 2 | ||||
| -rw-r--r-- | src/libsystemd-bus/test-bus-server.c | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/src/libsystemd-bus/bus-convenience.c b/src/libsystemd-bus/bus-convenience.c index 4dc65b9718..9bf2e2cbe5 100644 --- a/src/libsystemd-bus/bus-convenience.c +++ b/src/libsystemd-bus/bus-convenience.c @@ -87,7 +87,7 @@ _public_ int sd_bus_call_method( return r; } - return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply); + return sd_bus_call(bus, m, 0, error, reply); } _public_ int sd_bus_reply_method_return( @@ -422,5 +422,5 @@ _public_ int sd_bus_set_property( if (r < 0) return r; - return sd_bus_send_with_reply_and_block(bus, m, 0, error, NULL); + return sd_bus_call(bus, m, 0, error, NULL); } diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c index e92c3187eb..d277e1e0f0 100644 --- a/src/libsystemd-bus/bus-util.c +++ b/src/libsystemd-bus/bus-util.c @@ -236,7 +236,7 @@ static void async_polkit_query_free(sd_bus *b, AsyncPolkitQuery *q) { return; if (q->serial > 0 && b) - sd_bus_send_with_reply_cancel(b, q->serial); + sd_bus_call_async_cancel(b, q->serial); sd_bus_message_unref(q->request); sd_bus_message_unref(q->reply); @@ -362,7 +362,7 @@ int bus_verify_polkit_async( return r; } - r = sd_bus_send_with_reply(bus, pk, async_polkit_callback, q, 0, &q->serial); + r = sd_bus_call_async(bus, pk, async_polkit_callback, q, 0, &q->serial); if (r < 0) return r; diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index fceab505ac..fdfbbeb2be 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -396,7 +396,7 @@ static int bus_send_hello(sd_bus *bus) { if (r < 0) return r; - return sd_bus_send_with_reply(bus, m, hello_callback, NULL, 0, &bus->hello_serial); + return sd_bus_call_async(bus, m, hello_callback, NULL, 0, &bus->hello_serial); } int bus_start_running(sd_bus *bus) { @@ -1440,7 +1440,7 @@ static int timeout_compare(const void *a, const void *b) { return 0; } -_public_ int sd_bus_send_with_reply( +_public_ int sd_bus_call_async( sd_bus *bus, sd_bus_message *m, sd_bus_message_handler_t callback, @@ -1492,21 +1492,21 @@ _public_ int sd_bus_send_with_reply( r = prioq_put(bus->reply_callbacks_prioq, c, &c->prioq_idx); if (r < 0) { c->timeout = 0; - sd_bus_send_with_reply_cancel(bus, c->serial); + sd_bus_call_async_cancel(bus, c->serial); return r; } } r = sd_bus_send(bus, m, serial); if (r < 0) { - sd_bus_send_with_reply_cancel(bus, c->serial); + sd_bus_call_async_cancel(bus, c->serial); return r; } return r; } -_public_ int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) { +_public_ int sd_bus_call_async_cancel(sd_bus *bus, uint64_t serial) { struct reply_callback *c; assert_return(bus, -EINVAL); @@ -1549,7 +1549,7 @@ int bus_ensure_running(sd_bus *bus) { } } -_public_ int sd_bus_send_with_reply_and_block( +_public_ int sd_bus_call( sd_bus *bus, sd_bus_message *m, uint64_t usec, diff --git a/src/libsystemd-bus/test-bus-chat.c b/src/libsystemd-bus/test-bus-chat.c index a29fbdf9c4..67411f1184 100644 --- a/src/libsystemd-bus/test-bus-chat.c +++ b/src/libsystemd-bus/test-bus-chat.c @@ -437,7 +437,7 @@ static void* client2(void*p) { goto finish; } - 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)); goto finish; @@ -469,7 +469,7 @@ static void* client2(void*p) { sd_bus_message_unref(reply); reply = NULL; - r = sd_bus_send_with_reply_and_block(bus, m, 200 * USEC_PER_MSEC, &error, &reply); + r = sd_bus_call(bus, m, 200 * USEC_PER_MSEC, &error, &reply); if (r < 0) log_info("Failed to issue method call: %s", bus_error_message(&error, -r)); else @@ -490,7 +490,7 @@ static void* client2(void*p) { goto finish; } - r = sd_bus_send_with_reply(bus, m, quit_callback, &quit, 200 * USEC_PER_MSEC, NULL); + r = sd_bus_call_async(bus, m, quit_callback, &quit, 200 * USEC_PER_MSEC, NULL); if (r < 0) { log_info("Failed to issue method call: %s", bus_error_message(&error, -r)); goto finish; diff --git a/src/libsystemd-bus/test-bus-kernel-benchmark.c b/src/libsystemd-bus/test-bus-kernel-benchmark.c index 666c74cea3..18b08ed816 100644 --- a/src/libsystemd-bus/test-bus-kernel-benchmark.c +++ b/src/libsystemd-bus/test-bus-kernel-benchmark.c @@ -82,7 +82,7 @@ static void transaction(sd_bus *b, size_t sz) { memset(p, 0x80, sz); - assert_se(sd_bus_send_with_reply_and_block(b, m, 0, NULL, &reply) >= 0); + assert_se(sd_bus_call(b, m, 0, NULL, &reply) >= 0); } static void client_bisect(const char *address) { diff --git a/src/libsystemd-bus/test-bus-server.c b/src/libsystemd-bus/test-bus-server.c index 478a81e5cb..a9db1f4101 100644 --- a/src/libsystemd-bus/test-bus-server.c +++ b/src/libsystemd-bus/test-bus-server.c @@ -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; |