SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use sd_bus_message_send() instead of sd_bus_send() wherever possible

Browse Source 
Also, add a coccinelle script that patches this automatically.
This commit is contained in:
Lennart Poettering
2025-06-24 23:23:40 +09:00
committed by Yu Watanabe
parent 9422ce83c2
commit 51cc3825d1
20 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-job.c
+1 -1
View File
@@ -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[] = {
src/core/dbus-manager.c
+9 -9
View File
@@ -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) {
src/core/dbus-service.c
+1 -1
View File
@@ -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
src/core/dbus-unit.c
+3 -3
View File
@@ -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(
src/core/dbus.c
+1 -1
View File
@@ -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");