diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2007-11-26 13:43:17 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2007-11-26 13:43:17 +0000 |
| commit | 7e88afe4f8307c092172ff3c3b76c2f95ab00293 (patch) | |
| tree | bdc418344c1e1f724421120bdeeeab0dd7fa3ce5 /hcid/dbus-test.c | |
| parent | 4392fbd3d96e2eea0d91f0eb9fd059ab38255986 (diff) | |
Update services to new error codes and helper functions
Diffstat (limited to 'hcid/dbus-test.c')
| -rw-r--r-- | hcid/dbus-test.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/hcid/dbus-test.c b/hcid/dbus-test.c index 98303bc7..acd74ab4 100644 --- a/hcid/dbus-test.c +++ b/hcid/dbus-test.c @@ -45,6 +45,7 @@ #include "adapter.h" #include "dbus-hci.h" #include "dbus-error.h" +#include "error.h" #include "dbus-test.h" #define L2INFO_TIMEOUT (2 * 1000) @@ -424,11 +425,11 @@ static DBusHandlerResult audit_remote_device(DBusConnection *conn, if (dbus_error_is_set(&err)) { error("Can't extract message arguments:%s", err.message); dbus_error_free(&err); - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); } if (check_address(address) < 0) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); str2ba(address, &peer); str2ba(adapter->address, &local); @@ -507,11 +508,11 @@ static DBusHandlerResult cancel_audit_remote_device(DBusConnection *conn, if (dbus_error_is_set(&err)) { error("Can't extract message arguments:%s", err.message); dbus_error_free(&err); - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); } if (check_address(address) < 0) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); str2ba(address, &peer); str2ba(adapter->address, &local); @@ -567,11 +568,11 @@ static DBusHandlerResult get_l2cap_feature_mask(DBusConnection *conn, if (dbus_error_is_set(&err)) { error("Can't extract message arguments:%s", err.message); dbus_error_free(&err); - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); } if (check_address(address) < 0) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); str2ba(address, &peer); str2ba(adapter->address, &local); @@ -609,11 +610,11 @@ static DBusHandlerResult get_l2cap_mtu_size(DBusConnection *conn, if (dbus_error_is_set(&err)) { error("Can't extract message arguments:%s", err.message); dbus_error_free(&err); - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); } if (check_address(address) < 0) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); str2ba(address, &peer); str2ba(adapter->address, &local); |