From c670f828f156307b763ed3417c8ac44ee580fb22 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sat, 17 May 2025 19:59:40 +0200 Subject: [PATCH] sd-bus: rename cookie to ret_cookie Follow the argument comment naming. --- src/libsystemd/sd-bus/sd-bus.c | 8 ++++---- src/systemd/sd-bus.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 184f7c420bd..b0d0b0e1d14 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -2167,7 +2167,7 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { } } -_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *_m, uint64_t *cookie) { +_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *_m, uint64_t *ret_cookie) { _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = sd_bus_message_ref(_m); int r; @@ -2192,7 +2192,7 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *_m, uint64_t *cookie) { /* If the cookie number isn't kept, then we know that no reply * is expected */ - if (!cookie && !m->sealed) + if (!ret_cookie && !m->sealed) m->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; r = bus_seal_message(bus, m, 0); @@ -2244,8 +2244,8 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *_m, uint64_t *cookie) { } finish: - if (cookie) - *cookie = BUS_MESSAGE_COOKIE(m); + if (ret_cookie) + *ret_cookie = BUS_MESSAGE_COOKIE(m); return 1; } diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 0d62ca892f4..a530033055b 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -111,7 +111,7 @@ int sd_bus_get_scope(sd_bus *bus, const char **scope); int sd_bus_get_tid(sd_bus *bus, pid_t *tid); int sd_bus_get_owner_creds(sd_bus *bus, uint64_t creds_mask, sd_bus_creds **ret); -int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *cookie); +int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *ret_cookie); int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie); int sd_bus_call(sd_bus *bus, sd_bus_message *m, uint64_t usec, sd_bus_error *ret_error, sd_bus_message **reply); int sd_bus_call_async(sd_bus *bus, sd_bus_slot **slot, sd_bus_message *m, sd_bus_message_handler_t callback, void *userdata, uint64_t usec); -- 2.47.3