From: "Gustavo F. Padovan" <padovan@profusion.mobi>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 5/7] convert error to btd_error_not_connected()
Date: Wed, 8 Dec 2010 18:25:59 -0200 [thread overview]
Message-ID: <1291839961-14940-5-git-send-email-padovan@profusion.mobi> (raw)
In-Reply-To: <1291839961-14940-4-git-send-email-padovan@profusion.mobi>
---
network/connection.c | 8 +-------
serial/port.c | 2 +-
src/device.c | 4 +---
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/network/connection.c b/network/connection.c
index 37a7511..d24d96c 100644
--- a/network/connection.c
+++ b/network/connection.c
@@ -123,12 +123,6 @@ static inline DBusMessage *already_connected(DBusMessage *msg)
"Device already connected");
}
-static inline DBusMessage *not_connected(DBusMessage *msg)
-{
- return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed",
- "Device not connected");
-}
-
static inline DBusMessage *not_permited(DBusMessage *msg)
{
return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed",
@@ -460,7 +454,7 @@ static DBusMessage *connection_disconnect(DBusConnection *conn,
return connection_cancel(conn, msg, nc);
}
- return not_connected(msg);
+ return btd_error_not_connected(msg);
}
static DBusMessage *connection_get_properties(DBusConnection *conn,
diff --git a/serial/port.c b/serial/port.c
index 1d0bfc1..0d1e600 100644
--- a/serial/port.c
+++ b/serial/port.c
@@ -533,7 +533,7 @@ static DBusMessage *port_disconnect(DBusConnection *conn,
return btd_error_does_not_exist(msg);
if (!port->listener_id)
- return failed(msg, "Not connected");
+ return btd_error_not_connected(msg);
owner = dbus_message_get_sender(port->msg);
caller = dbus_message_get_sender(msg);
diff --git a/src/device.c b/src/device.c
index cc8131b..91b9d23 100644
--- a/src/device.c
+++ b/src/device.c
@@ -799,9 +799,7 @@ static DBusMessage *disconnect(DBusConnection *conn, DBusMessage *msg,
struct btd_device *device = user_data;
if (!device->handle)
- return g_dbus_create_error(msg,
- ERROR_INTERFACE ".NotConnected",
- "Device is not connected");
+ return btd_error_not_connected(msg);
device_request_disconnect(device, msg);
--
1.7.3.2
next prev parent reply other threads:[~2010-12-08 20:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-08 20:25 [PATCH 1/7] Fix coding styling issues in src/error.c Gustavo F. Padovan
2010-12-08 20:25 ` [PATCH 2/7] convert errors to btd_error_not_authorized() Gustavo F. Padovan
2010-12-08 20:25 ` [PATCH 3/7] convert errors to btd_error_does_not_exist() Gustavo F. Padovan
2010-12-08 20:25 ` [PATCH 4/7] convert error to btd_error_busy() Gustavo F. Padovan
2010-12-08 20:25 ` Gustavo F. Padovan [this message]
2010-12-08 20:26 ` [PATCH 6/7] convert error to btd_error_not_supported() Gustavo F. Padovan
2010-12-08 20:26 ` [PATCH 7/7] Add btd_error_already_connected() Gustavo F. Padovan
2010-12-08 20:58 ` [PATCH 1/7] Fix coding styling issues in src/error.c Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291839961-14940-5-git-send-email-padovan@profusion.mobi \
--to=padovan@profusion.mobi \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox