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

sd-bus: use bus_error_message() at several more places

Browse Source 
For CID#1645014, CID#1645016, and CID#1645017.
This commit is contained in:
Yu Watanabe
2026-02-17 17:00:42 +09:00
parent ce6ea42b69
commit 2e8cfb7cef
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/bus-control.c
+13 -8
View File
@@ -4,6 +4,7 @@
#include "alloc-util.h"
#include "bus-control.h"
#include "bus-error.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "fd-util.h"
@@ -136,11 +137,14 @@ static int default_request_name_handler(
assert(m);
if (sd_bus_message_is_method_error(m, NULL)) {
log_debug_errno(sd_bus_message_get_errno(m),
"Unable to request name, failing connection: %s",
sd_bus_message_get_error(m)->message);
const sd_bus_error *e = ASSERT_PTR(sd_bus_message_get_error(m));
r = sd_bus_error_get_errno(e);
bus_enter_closing(sd_bus_message_get_bus(m), -sd_bus_message_get_errno(m));
log_debug_errno(r,
"Unable to request name, failing connection: %s",
bus_error_message(e, r));
bus_enter_closing(sd_bus_message_get_bus(m), -r);
return 1;
}
@@ -290,11 +294,12 @@ static int default_release_name_handler(
assert(m);
if (sd_bus_message_is_method_error(m, NULL)) {
log_debug_errno(sd_bus_message_get_errno(m),
"Unable to release name, failing connection: %s",
sd_bus_message_get_error(m)->message);
const sd_bus_error *e = ASSERT_PTR(sd_bus_message_get_error(m));
r = sd_bus_error_get_errno(e);
bus_enter_closing(sd_bus_message_get_bus(m), -sd_bus_message_get_errno(m));
log_debug_errno(r, "Unable to release name, failing connection: %s", bus_error_message(e, r));
bus_enter_closing(sd_bus_message_get_bus(m), -r);
return 1;
}
src/libsystemd/sd-bus/sd-bus.c
+5 -2
View File
@@ -3483,10 +3483,13 @@ static int add_match_callback(
sd_bus_slot_ref(match_slot);
if (sd_bus_message_is_method_error(m, NULL)) {
r = log_debug_errno(sd_bus_message_get_errno(m),
const sd_bus_error *e = ASSERT_PTR(sd_bus_message_get_error(m));
r = sd_bus_error_get_errno(e);
r = log_debug_errno(r,
"Unable to add match %s, failing connection: %s",
match_slot->match_callback.match_string,
sd_bus_message_get_error(m)->message);
bus_error_message(e, r));
failed = true;
} else