From 51cc3825d17d2f3ca8d5f9cdbe79a5a2900e7b5d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 24 Jun 2025 13:07:54 +0200
Subject: [PATCH] tree-wide: use sd_bus_message_send() instead of sd_bus_send()
 wherever possible

Also, add a coccinelle script that patches this automatically.
---
 coccinelle/bus-message-send.cocci  |  6 ++++++
 src/core/dbus-job.c                |  2 +-
 src/core/dbus-manager.c            | 18 +++++++++---------
 src/core/dbus-service.c            |  2 +-
 src/core/dbus-unit.c               |  6 +++---
 src/core/dbus.c                    |  2 +-
 src/home/homed-manager-bus.c       |  6 +++---
 src/hostname/hostnamed.c           |  2 +-
 src/import/importd.c               |  4 ++--
 src/login/logind-dbus.c            | 10 +++++-----
 src/machine/image-dbus.c           |  2 +-
 src/machine/machine-dbus.c         | 10 +++++-----
 src/machine/machined-dbus.c        |  6 +++---
 src/network/networkd-link-bus.c    |  2 +-
 src/network/networkd-manager-bus.c |  8 ++++----
 src/portable/portabled-bus.c       |  6 +++---
 src/portable/portabled-image-bus.c |  2 +-
 src/shared/bus-util.c              |  2 +-
 src/sysupdate/sysupdated.c         | 12 ++++++------
 src/timedate/timedated.c           |  2 +-
 20 files changed, 58 insertions(+), 52 deletions(-)
 create mode 100644 coccinelle/bus-message-send.cocci

diff --git a/coccinelle/bus-message-send.cocci b/coccinelle/bus-message-send.cocci
new file mode 100644
index 00000000000..ffe7d6545c4
--- /dev/null
+++ b/coccinelle/bus-message-send.cocci
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+@@
+expression m;
+@@
+- sd_bus_send(NULL, m, NULL)
++ sd_bus_message_send(m)
diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index 854d329c014..207c8b026b3 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -116,7 +116,7 @@ int bus_job_method_get_waiting_jobs(sd_bus_message *message, void *userdata, sd_
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 const sd_bus_vtable bus_job_vtable[] = {
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index c79118f98a8..330d3cea2ea 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -685,7 +685,7 @@ static int method_get_unit_by_pidfd(sd_bus_message *message, void *userdata, sd_
         if (r < 0)
                 return sd_bus_error_set_errnof(error, r, "Failed to get PID from PIDFD: %m");
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_load_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -948,7 +948,7 @@ static int method_list_units_by_names(sd_bus_message *message, void *userdata, s
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_get_unit_processes(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -1246,7 +1246,7 @@ static int list_units_filtered(sd_bus_message *message, void *userdata, sd_bus_e
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_list_units(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -1329,7 +1329,7 @@ static int method_list_jobs(sd_bus_message *message, void *userdata, sd_bus_erro
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_subscribe(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -2058,7 +2058,7 @@ static int method_get_dynamic_users(sd_bus_message *message, void *userdata, sd_
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_enqueue_marked_jobs(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -2126,7 +2126,7 @@ static int method_enqueue_marked_jobs(sd_bus_message *message, void *userdata, s
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int list_unit_files_by_patterns(sd_bus_message *message, void *userdata, sd_bus_error *error, char **states, char **patterns) {
@@ -2166,7 +2166,7 @@ static int list_unit_files_by_patterns(sd_bus_message *message, void *userdata,
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_list_unit_files(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -2357,7 +2357,7 @@ static int reply_install_changes_and_free(
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_enable_unit_files_generic(
@@ -2735,7 +2735,7 @@ static int method_get_unit_file_links(sd_bus_message *message, void *userdata, s
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_get_job_waiting(sd_bus_message *message, void *userdata, sd_bus_error *error) {
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 6c1866859d9..0d5c5041f8f 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -295,7 +295,7 @@ int bus_service_method_dump_file_descriptor_store(sd_bus_message *message, void
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 #if __SIZEOF_SIZE_T__ == 8
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 8d8169df55e..b812890aa78 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -1389,7 +1389,7 @@ int bus_unit_method_get_processes(sd_bus_message *message, void *userdata, sd_bu
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int property_get_ip_counter(
@@ -1793,7 +1793,7 @@ int bus_unit_send_pending_freezer_message(Unit *u, bool canceled) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_send(NULL, reply, NULL);
+        r = sd_bus_message_send(reply);
         if (r < 0)
                 log_warning_errno(r, "Failed to send queued message, ignoring: %m");
 
@@ -1998,7 +1998,7 @@ int bus_unit_queue_job(
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int bus_unit_set_live_property(
diff --git a/src/core/dbus.c b/src/core/dbus.c
index cb167fa2c18..223c0b79d21 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -62,7 +62,7 @@ void bus_send_pending_reload_message(Manager *m) {
         /* If we cannot get rid of this message we won't dispatch any D-Bus messages, so that we won't end up wanting
          * to queue another message. */
 
-        r = sd_bus_send(NULL, m->pending_reload_message, NULL);
+        r = sd_bus_message_send(m->pending_reload_message);
         if (r < 0)
                 log_warning_errno(r, "Failed to send queued reload message, ignoring: %m");
 
diff --git a/src/home/homed-manager-bus.c b/src/home/homed-manager-bus.c
index 77b8ed92ee1..64acbf07d09 100644
--- a/src/home/homed-manager-bus.c
+++ b/src/home/homed-manager-bus.c
@@ -242,7 +242,7 @@ static int method_list_homes(
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_get_user_record_by_name(
@@ -864,7 +864,7 @@ static int method_list_signing_keys(sd_bus_message *message, void *userdata, sd_
         if (r < 0)
                 return r;
 
-        return sd_bus_send(/* bus= */ NULL, reply, /* ret_cookie= */ NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_get_signing_key(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -910,7 +910,7 @@ static int method_get_signing_key(sd_bus_message *message, void *userdata, sd_bu
         if (r < 0)
                 return r;
 
-        return sd_bus_send(/* bus= */ NULL, reply, /* ret_cookie= */ NULL);
+        return sd_bus_message_send(reply);
 }
 
 static bool valid_public_key_name(const char *fn) {
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index d0e4ebeeda0..326883bbe36 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1590,7 +1590,7 @@ static int method_get_product_uuid(sd_bus_message *m, void *userdata, sd_bus_err
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_get_hardware_serial(sd_bus_message *m, void *userdata, sd_bus_error *error) {
diff --git a/src/import/importd.c b/src/import/importd.c
index b28e6445341..95c3e2b4333 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -1231,7 +1231,7 @@ static int method_list_transfers(sd_bus_message *msg, void *userdata, sd_bus_err
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_cancel(sd_bus_message *msg, void *userdata, sd_bus_error *error) {
@@ -1368,7 +1368,7 @@ static int method_list_images(sd_bus_message *msg, void *userdata, sd_bus_error
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int property_get_progress(
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 56dd3506619..d0560a27c91 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -670,7 +670,7 @@ static int method_list_sessions(sd_bus_message *message, void *userdata, sd_bus_
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_list_sessions_ex(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -724,7 +724,7 @@ static int method_list_sessions_ex(sd_bus_message *message, void *userdata, sd_b
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_list_users(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -762,7 +762,7 @@ static int method_list_users(sd_bus_message *message, void *userdata, sd_bus_err
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_list_seats(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -797,7 +797,7 @@ static int method_list_seats(sd_bus_message *message, void *userdata, sd_bus_err
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_list_inhibitors(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -833,7 +833,7 @@ static int method_list_inhibitors(sd_bus_message *message, void *userdata, sd_bu
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int manager_choose_session_id(
diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index 9142157ea4b..4ae36558402 100644
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -316,7 +316,7 @@ int bus_image_method_get_machine_id(
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 int bus_image_method_get_machine_info(
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index c299bf71fa3..f4676106ac2 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -202,7 +202,7 @@ int bus_machine_method_get_addresses(sd_bus_message *message, void *userdata, sd
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 int bus_machine_method_get_ssh_info(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -223,7 +223,7 @@ int bus_machine_method_get_ssh_info(sd_bus_message *message, void *userdata, sd_
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -281,7 +281,7 @@ int bus_machine_method_open_pty(sd_bus_message *message, void *userdata, sd_bus_
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 int bus_machine_method_open_login(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -326,7 +326,7 @@ int bus_machine_method_open_login(sd_bus_message *message, void *userdata, sd_bu
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -410,7 +410,7 @@ int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bu
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 int bus_machine_method_bind_mount(sd_bus_message *message, void *userdata, sd_bus_error *error) {
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 222e3934d9c..6a31e6aa3be 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -222,7 +222,7 @@ static int method_list_machines(sd_bus_message *message, void *userdata, sd_bus_
         if (r < 0)
                 return sd_bus_error_set_errno(error, r);
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_create_or_register_machine(
@@ -532,7 +532,7 @@ static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_er
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_open_machine_pty(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -666,7 +666,7 @@ static int clean_pool_done(Operation *operation, int child_error, sd_bus_error *
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_clean_pool(sd_bus_message *message, void *userdata, sd_bus_error *error) {
diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 5b9e901bf84..127a8628174 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -704,7 +704,7 @@ int bus_link_method_describe(sd_bus_message *message, void *userdata, sd_bus_err
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static const sd_bus_vtable link_vtable[] = {
diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index f04a15487d1..a98561b25e7 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -55,7 +55,7 @@ static int method_list_links(sd_bus_message *message, void *userdata, sd_bus_err
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_get_link_by_name(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -85,7 +85,7 @@ static int method_get_link_by_name(sd_bus_message *message, void *userdata, sd_b
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_get_link_by_index(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -115,7 +115,7 @@ static int method_get_link_by_index(sd_bus_message *message, void *userdata, sd_
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int call_link_method(Manager *m, sd_bus_message *message, sd_bus_message_handler_t handler, sd_bus_error *error) {
@@ -254,7 +254,7 @@ static int bus_method_describe(sd_bus_message *message, void *userdata, sd_bus_e
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int property_get_namespace_id(
diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c
index bc62d31c22b..d83e073023f 100644
--- a/src/portable/portabled-bus.c
+++ b/src/portable/portabled-bus.c
@@ -191,7 +191,7 @@ static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_er
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int redirect_method_to_image(
@@ -577,7 +577,7 @@ int reply_portable_changes(sd_bus_message *m, const PortableChange *changes, siz
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 int reply_portable_changes_pair(
@@ -604,5 +604,5 @@ int reply_portable_changes_pair(
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index caad5d4b575..e8bcb900efc 100644
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -250,7 +250,7 @@ int bus_image_common_get_metadata(
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int bus_image_method_get_metadata(sd_bus_message *message, void *userdata, sd_bus_error *error) {
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index efde906636c..1b3779633e4 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -815,7 +815,7 @@ int bus_reply_pair_array(sd_bus_message *m, char * const *l) {
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdata, sd_bus_error *reterr_error) {
diff --git a/src/sysupdate/sysupdated.c b/src/sysupdate/sysupdated.c
index c46b2804b5b..1bee4dd7bc1 100644
--- a/src/sysupdate/sysupdated.c
+++ b/src/sysupdate/sysupdated.c
@@ -887,7 +887,7 @@ static int target_method_list_finish(
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int target_method_list(sd_bus_message *msg, void *userdata, sd_bus_error *error) {
@@ -1281,7 +1281,7 @@ static int target_method_get_appstream(sd_bus_message *msg, void *userdata, sd_b
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int target_method_list_features(sd_bus_message *msg, void *userdata, sd_bus_error *error) {
@@ -1320,7 +1320,7 @@ static int target_method_list_features(sd_bus_message *msg, void *userdata, sd_b
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int target_method_describe_feature(sd_bus_message *msg, void *userdata, sd_bus_error *error) {
@@ -1910,7 +1910,7 @@ static int method_list_targets(sd_bus_message *msg, void *userdata, sd_bus_error
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_list_jobs(sd_bus_message *msg, void *userdata, sd_bus_error *error) {
@@ -1943,7 +1943,7 @@ static int method_list_jobs(sd_bus_message *msg, void *userdata, sd_bus_error *e
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static int method_list_appstream(sd_bus_message *msg, void *userdata, sd_bus_error *error) {
@@ -1979,7 +1979,7 @@ static int method_list_appstream(sd_bus_message *msg, void *userdata, sd_bus_err
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static const sd_bus_vtable manager_vtable[] = {
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index cafd3494cb9..662cc29ac5f 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1064,7 +1064,7 @@ static int method_list_timezones(sd_bus_message *m, void *userdata, sd_bus_error
         if (r < 0)
                 return r;
 
-        return sd_bus_send(NULL, reply, NULL);
+        return sd_bus_message_send(reply);
 }
 
 static const sd_bus_vtable timedate_vtable[] = {