mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Simplify redundant error check

Browse source 
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.
This commit is contained in:
Mikel Astiz 2013-01-11 11:07:49 +01:00 • committed by Tanu Kaskinen
parent 241059de70
commit a0cc0136ea
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/bluetooth/bluetooth-util.c
View file

@ -1129,7 +1129,7 @@ int pa_bluetooth_transport_acquire(pa_bluetooth_transport *t, bool optional, siz
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;
}
@ -1220,9 +1220,7 @@ static int setup_dbus(pa_bluetooth_discovery *y) {
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;