mirror of
https://github.com/systemd/systemd
synced 2024-10-15 12:34:37 +00:00
sd-bus: simplify bus_maybe_reply_error
sd_bus_reply_method_errno already does the same two checks (sd_bus_error_is_set(error), r < 0) internally. But it did them in opposite order. The effect is the same, because sd_bus_reply_method_errno falls back to sd_bus_reply_method_error, but it seems inelegant. So let's simplify bus_maybe_reply_error() to offload the job fully to sd_bus_reply_method_errno(). No functional change.
This commit is contained in:
parent
f5d9daaea3
commit
934cf0a9c7
|
@ -314,13 +314,9 @@ char *bus_address_escape(const char *v) {
|
|||
int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error) {
|
||||
assert(m);
|
||||
|
||||
if (r < 0) {
|
||||
if (sd_bus_error_is_set(error) || r < 0) {
|
||||
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
|
||||
sd_bus_reply_method_errno(m, r, error);
|
||||
|
||||
} else if (sd_bus_error_is_set(error)) {
|
||||
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
|
||||
sd_bus_reply_method_error(m, error);
|
||||
} else
|
||||
return r;
|
||||
|
||||
|
|
Loading…
Reference in a new issue