diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-02-05 17:28:32 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-02-05 17:31:13 -0600 |
| commit | c02dc9c68b47f93793ec9699069d0a77bcac3e12 (patch) | |
| tree | 34809b6659fd0a61ce39065764c0e568e8c882bc | |
| parent | 5237a12ca24690ecdef9dc99be586b4ee313fa90 (diff) | |
| download | ofono-c02dc9c68b47f93793ec9699069d0a77bcac3e12.tar.bz2 | |
Fix: Simplify overly complex error handling
| -rw-r--r-- | plugins/hfp.c | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/plugins/hfp.c b/plugins/hfp.c index 11323cc4..d1d43f48 100644 --- a/plugins/hfp.c +++ b/plugins/hfp.c @@ -573,7 +573,6 @@ done: static void list_devices_cb(DBusPendingCall *call, gpointer user_data) { - DBusError err; DBusMessage *reply; char **device_list = NULL; int num, ret, i; @@ -585,23 +584,10 @@ static void list_devices_cb(DBusPendingCall *call, gpointer user_data) goto done; } - dbus_error_init(&err); - - if (dbus_message_get_args(reply, &err, DBUS_TYPE_ARRAY, + if (dbus_message_get_args(reply, NULL, DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &device_list, - &num, DBUS_TYPE_INVALID) == FALSE) { - if (device_list == NULL) { - dbus_error_free(&err); - goto done; - } - - if (dbus_error_is_set(&err) == TRUE) { - ofono_error("%s", err.message); - dbus_error_free(&err); - } - + &num, DBUS_TYPE_INVALID) == FALSE) goto done; - } for (i = 0 ; i < num ; i++) { ret = send_method_call(BLUEZ_SERVICE, device_list[i], @@ -668,7 +654,6 @@ static gboolean uuid_emitted(DBusConnection *connection, DBusMessage *message, static void list_adapters_cb(DBusPendingCall *call, gpointer user_data) { - DBusError err; DBusMessage *reply; char **adapter_list = NULL; int num, ret, i; @@ -680,23 +665,10 @@ static void list_adapters_cb(DBusPendingCall *call, gpointer user_data) goto done; } - dbus_error_init(&err); - - if (dbus_message_get_args(reply, &err, DBUS_TYPE_ARRAY, + if (dbus_message_get_args(reply, NULL, DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &adapter_list, - &num, DBUS_TYPE_INVALID) == FALSE) { - if (adapter_list == NULL) { - dbus_error_free(&err); - goto done; - } - - if (dbus_error_is_set(&err) == TRUE) { - ofono_error("%s", err.message); - dbus_error_free(&err); - } - + &num, DBUS_TYPE_INVALID) == FALSE) goto done; - } for (i = 0 ; i < num ; i++) { ret = send_method_call(BLUEZ_SERVICE, adapter_list[i], |