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-security.c | |
| parent | 4392fbd3d96e2eea0d91f0eb9fd059ab38255986 (diff) | |
Update services to new error codes and helper functions
Diffstat (limited to 'hcid/dbus-security.c')
| -rw-r--r-- | hcid/dbus-security.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c index 1383a263..38e588be 100644 --- a/hcid/dbus-security.c +++ b/hcid/dbus-security.c @@ -50,6 +50,7 @@ #include "dbus-common.h" #include "dbus-service.h" #include "dbus-error.h" +#include "error.h" #include "dbus-security.h" #include "dbus-hci.h" @@ -259,10 +260,10 @@ static DBusHandlerResult register_passkey_agent(DBusConnection *conn, DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &addr, DBUS_TYPE_INVALID)) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); if ((check_address(addr) < 0) || (path[0] != '/')) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); memset(&ref, 0, sizeof(ref)); @@ -317,7 +318,7 @@ static DBusHandlerResult unregister_passkey_agent(DBusConnection *conn, DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &addr, DBUS_TYPE_INVALID)) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); memset(&ref, 0, sizeof(ref)); @@ -357,7 +358,7 @@ static DBusHandlerResult register_default_passkey_agent(DBusConnection *conn, if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); default_agent = passkey_agent_new(NULL, conn, dbus_message_get_sender(msg), path, NULL); @@ -398,7 +399,7 @@ static DBusHandlerResult unregister_default_passkey_agent(DBusConnection *conn, if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); name = dbus_message_get_sender(msg); @@ -573,7 +574,7 @@ static DBusHandlerResult register_default_auth_agent(DBusConnection *conn, if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); default_auth_agent = auth_agent_new(conn, dbus_message_get_sender(msg), path); @@ -614,7 +615,7 @@ static DBusHandlerResult unregister_default_auth_agent(DBusConnection *conn, if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) - return error_invalid_arguments(conn, msg); + return error_invalid_arguments(conn, msg, NULL); name = dbus_message_get_sender(msg); |