Also, add a coccinelle script that patches this automatically.
--- /dev/null
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+@@
+expression m;
+@@
+- sd_bus_send(NULL, m, NULL)
++ sd_bus_message_send(m)
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[] = {
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) {
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) {
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) {
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) {
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) {
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) {
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) {
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(
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) {
if (r < 0)
return r;
- return sd_bus_send(NULL, reply, NULL);
+ return sd_bus_message_send(reply);
}
#if __SIZEOF_SIZE_T__ == 8
if (r < 0)
return r;
- return sd_bus_send(NULL, reply, NULL);
+ return sd_bus_message_send(reply);
}
static int property_get_ip_counter(
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");
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(
/* 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");
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(
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) {
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) {
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) {
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) {
if (r < 0)
return r;
- return sd_bus_send(NULL, reply, NULL);
+ return sd_bus_message_send(reply);
}
static int property_get_progress(
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) {
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) {
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) {
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) {
if (r < 0)
return r;
- return sd_bus_send(NULL, reply, NULL);
+ return sd_bus_message_send(reply);
}
static int manager_choose_session_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(
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) {
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) {
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) {
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) {
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) {
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(
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) {
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) {
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[] = {
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) {
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) {
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) {
if (r < 0)
return r;
- return sd_bus_send(NULL, reply, NULL);
+ return sd_bus_message_send(reply);
}
static int property_get_namespace_id(
if (r < 0)
return r;
- return sd_bus_send(NULL, reply, NULL);
+ return sd_bus_message_send(reply);
}
static int redirect_method_to_image(
if (r < 0)
return r;
- return sd_bus_send(NULL, reply, NULL);
+ return sd_bus_message_send(reply);
}
int reply_portable_changes_pair(
if (r < 0)
return r;
- return sd_bus_send(NULL, reply, NULL);
+ return sd_bus_message_send(reply);
}
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) {
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) {
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) {
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) {
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) {
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) {
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) {
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[] = {
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[] = {