From: Gustavo Padovan <gustavo@padovan.org>
To: linux-bluetooth@vger.kernel.org
Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Subject: [PATCH 3/9] adapter: rename discovery_client to watch_client
Date: Tue, 11 Jun 2013 11:56:21 +0100 [thread overview]
Message-ID: <1370948187-3702-3-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1370948187-3702-1-git-send-email-gustavo@padovan.org>
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Rename to a more generic name since we will have different uses for this.
---
src/adapter.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 5f01edf..0277057 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -105,7 +105,7 @@ static uint8_t mgmt_revision = 0;
static GSList *adapter_drivers = NULL;
-struct discovery_client {
+struct watch_client {
struct btd_adapter *adapter;
char *owner;
guint watch;
@@ -1480,7 +1480,7 @@ static void stop_discovery_complete(uint8_t status, uint16_t length,
static int compare_discovery_sender(gconstpointer a, gconstpointer b)
{
- const struct discovery_client *client = a;
+ const struct watch_client *client = a;
const char *sender = b;
return g_strcmp0(client->owner, sender);
@@ -1522,7 +1522,7 @@ static gboolean remove_temp_devices(gpointer user_data)
static void discovery_destroy(void *user_data)
{
- struct discovery_client *client = user_data;
+ struct watch_client *client = user_data;
struct btd_adapter *adapter = client->adapter;
DBG("owner %s", client->owner);
@@ -1560,7 +1560,7 @@ static void discovery_destroy(void *user_data)
static void discovery_disconnect(DBusConnection *conn, void *user_data)
{
- struct discovery_client *client = user_data;
+ struct watch_client *client = user_data;
struct btd_adapter *adapter = client->adapter;
struct mgmt_cp_stop_discovery cp;
@@ -1604,7 +1604,7 @@ static DBusMessage *start_discovery(DBusConnection *conn,
{
struct btd_adapter *adapter = user_data;
const char *sender = dbus_message_get_sender(msg);
- struct discovery_client *client;
+ struct watch_client *client;
GSList *list;
DBG("sender %s", sender);
@@ -1621,7 +1621,7 @@ static DBusMessage *start_discovery(DBusConnection *conn,
if (list)
return btd_error_busy(msg);
- client = g_new0(struct discovery_client, 1);
+ client = g_new0(struct watch_client, 1);
client->adapter = adapter;
client->owner = g_strdup(sender);
@@ -1648,7 +1648,7 @@ static DBusMessage *stop_discovery(DBusConnection *conn,
struct btd_adapter *adapter = user_data;
const char *sender = dbus_message_get_sender(msg);
struct mgmt_cp_stop_discovery cp;
- struct discovery_client *client;
+ struct watch_client *client;
GSList *list;
DBG("sender %s", sender);
@@ -4264,7 +4264,7 @@ static void adapter_stop(struct btd_adapter *adapter)
cancel_passive_scanning(adapter);
while (adapter->discovery_list) {
- struct discovery_client *client;
+ struct watch_client *client;
client = adapter->discovery_list->data;
--
1.8.1.4
next prev parent reply other threads:[~2013-06-11 10:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 10:56 [PATCH 1/9] adapter: fix setting of discoverable timeout Gustavo Padovan
2013-06-11 10:56 ` [PATCH 2/9] adapter: remove unused toggle_discoverable Gustavo Padovan
2013-06-11 10:56 ` Gustavo Padovan [this message]
2013-06-11 10:56 ` [PATCH 4/9] adapter: rename compare_discovery_sender Gustavo Padovan
2013-06-11 10:56 ` [PATCH 5/9] doc: add EnablePairing() and DisablePairing() Gustavo Padovan
2013-06-16 11:42 ` Marcel Holtmann
2013-06-11 10:56 ` [PATCH 6/9] adapter: " Gustavo Padovan
2013-06-11 10:56 ` [PATCH 7/9] adapter: add Pairing property to report ongoing Pairing Session Gustavo Padovan
2013-06-11 10:56 ` [PATCH 8/9] adapter: forbid properties to be set during " Gustavo Padovan
2013-06-11 10:56 ` [PATCH 9/9] test: add pairing command to test-adapter Gustavo Padovan
2013-06-17 8:49 ` [PATCH 1/9] adapter: fix setting of discoverable timeout 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=1370948187-3702-3-git-send-email-gustavo@padovan.org \
--to=gustavo@padovan.org \
--cc=gustavo.padovan@collabora.co.uk \
--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;
as well as URLs for NNTP newsgroup(s).