As pointed out by Tanu, checking both error conditions is redundant and
raises the question whether it's possible that one of the conditions is
true while the other is false.
Therefore, simplify the condition by just checking one part of the
disjunction.
pa_assert_se(dbus_message_append_args(m, DBUS_TYPE_STRING, &accesstype, DBUS_TYPE_INVALID));
r = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(t->device->discovery->connection), m, -1, &err);
- if (dbus_error_is_set(&err) || !r) {
+ if (!r) {
dbus_error_free(&err);
return -1;
}
dbus_error_init(&err);
- y->connection = pa_dbus_bus_get(y->core, DBUS_BUS_SYSTEM, &err);
-
- if (dbus_error_is_set(&err) || !y->connection) {
+ if (!(y->connection = pa_dbus_bus_get(y->core, DBUS_BUS_SYSTEM, &err))) {
pa_log("Failed to get D-Bus connection: %s", err.message);
dbus_error_free(&err);
return -1;