korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-26 05:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

convert errors to btd_error_does_not_exist()

Browse Source
This commit is contained in:
Gustavo F. Padovan 2010-12-08 18:25:57 -02:00 committed by Johan Hedberg
parent 09be5d6efa
commit 3df548164d
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/gateway.c
View File

@ -522,9 +522,7 @@ static DBusMessage *unregister_agent(DBusConnection *conn,
return btd_error_invalid_args(msg);
if (strcmp(gw->agent->path, path) != 0)
return g_dbus_create_error(msg,
ERROR_INTERFACE ".Failed",
"Unknown object path");
return btd_error_does_not_exist(msg);
g_dbus_remove_watch(device->conn, gw->agent->watch);

3
audio/media.c
View File

@ -351,8 +351,7 @@ static DBusMessage *unregister_endpoint(DBusConnection *conn, DBusMessage *msg,
endpoint = media_adapter_find_endpoint(adapter, sender, path, NULL);
if (endpoint == NULL)
return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed",
"Endpoint not registered");
return btd_error_does_not_exist(msg);
media_endpoint_remove(endpoint);

2
plugins/service.c
View File

@ -600,7 +600,7 @@ static DBusMessage *request_authorization(DBusConnection *conn,
sender = dbus_message_get_sender(msg);
if (find_pending_by_sender(serv_adapter, sender))
return failed(msg);
return btd_error_does_not_exist(msg);
user_record = find_record(serv_adapter, handle, sender);
if (!user_record) {

4
src/device.c
View File

@ -723,9 +723,7 @@ static DBusMessage *cancel_discover(DBusConnection *conn,
const char *requestor;
if (!device->browse)
return g_dbus_create_error(msg,
ERROR_INTERFACE ".Failed",
"No pending discovery");
return btd_error_does_not_exist(msg);
if (!dbus_message_is_method_call(device->browse->msg, DEVICE_INTERFACE,
"DiscoverServices"))