summaryrefslogtreecommitdiffstats
path: root/hcid/dbus-manager.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-03-09 17:57:09 +0000
committerMarcel Holtmann <marcel@holtmann.org>2006-03-09 17:57:09 +0000
commit4bac26fbcf785c3a438ac3b2c2edb1227a800023 (patch)
treedef7373f622713fb89e30d96a3b3d6ab5dbbed55 /hcid/dbus-manager.c
parent148aa53876853a637e5b94f3c6aae5fb2d788c90 (diff)
Cleanup the error definitions and add some new ones
Diffstat (limited to 'hcid/dbus-manager.c')
-rw-r--r--hcid/dbus-manager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hcid/dbus-manager.c b/hcid/dbus-manager.c
index 6981d9d2..784266fd 100644
--- a/hcid/dbus-manager.c
+++ b/hcid/dbus-manager.c
@@ -50,7 +50,7 @@ static DBusMessage *handle_mgr_list_devices_req(DBusMessage *msg, void *data)
sk = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
if (sk < 0)
- return error_generic(msg, errno);
+ return error_failed(msg, errno);
dl = malloc(HCI_MAX_DEV * sizeof(*dr) + sizeof(*dl));
if (!dl) {
@@ -62,7 +62,7 @@ static DBusMessage *handle_mgr_list_devices_req(DBusMessage *msg, void *data)
dr = dl->dev_req;
if (ioctl(sk, HCIGETDEVLIST, dl) < 0) {
- reply = error_generic(msg, errno);
+ reply = error_failed(msg, errno);
goto failed;
}
@@ -112,7 +112,7 @@ static DBusMessage *handle_mgr_default_device_req(DBusMessage *msg, void *data)
int default_dev = get_default_dev_id();
if (default_dev < 0)
- return error_no_such_device(msg);
+ return error_no_such_adapter(msg);
reply = dbus_message_new_method_return(msg);
if (!reply)