From: Filippo Giunchedi <filippo@esaurito.net>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 3/5] test/agent.c: rename device into adapter in functions
Date: Thu, 2 Jul 2009 11:14:26 +0200 [thread overview]
Message-ID: <1246526068-13364-3-git-send-email-filippo@esaurito.net> (raw)
In-Reply-To: <1246526068-13364-1-git-send-email-filippo@esaurito.net>
---
test/agent.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/agent.c b/test/agent.c
index b9485d2..390b3d8 100644
--- a/test/agent.c
+++ b/test/agent.c
@@ -285,7 +285,7 @@ static const DBusObjectPathVTable agent_table = {
.message_function = agent_message,
};
-static int register_agent(DBusConnection *conn, const char *device_path,
+static int register_agent(DBusConnection *conn, const char *adapter_path,
const char *agent_path,
const char *capabilities)
{
@@ -298,7 +298,7 @@ static int register_agent(DBusConnection *conn, const char *device_path,
return -1;
}
- msg = dbus_message_new_method_call("org.bluez", device_path,
+ msg = dbus_message_new_method_call("org.bluez", adapter_path,
"org.bluez.Adapter", "RegisterAgent");
if (!msg) {
fprintf(stderr, "Can't allocate new method call\n");
@@ -331,13 +331,13 @@ static int register_agent(DBusConnection *conn, const char *device_path,
return 0;
}
-static int unregister_agent(DBusConnection *conn, const char *device_path,
+static int unregister_agent(DBusConnection *conn, const char *adapter_path,
const char *agent_path)
{
DBusMessage *msg, *reply;
DBusError err;
- msg = dbus_message_new_method_call("org.bluez", device_path,
+ msg = dbus_message_new_method_call("org.bluez", adapter_path,
"org.bluez.Adapter", "UnregisterAgent");
if (!msg) {
fprintf(stderr, "Can't allocate new method call\n");
@@ -371,7 +371,7 @@ static int unregister_agent(DBusConnection *conn, const char *device_path,
return 0;
}
-static int create_paired_device(DBusConnection *conn, const char *device_path,
+static int create_paired_device(DBusConnection *conn, const char *adapter_path,
const char *agent_path,
const char *capabilities,
const char *target)
@@ -379,7 +379,7 @@ static int create_paired_device(DBusConnection *conn, const char *device_path,
dbus_bool_t success;
DBusMessage *msg;
- msg = dbus_message_new_method_call("org.bluez", device_path,
+ msg = dbus_message_new_method_call("org.bluez", adapter_path,
"org.bluez.Adapter",
"CreatePairedDevice");
if (!msg) {
@@ -406,15 +406,15 @@ static int create_paired_device(DBusConnection *conn, const char *device_path,
return 0;
}
-static char *get_device(DBusConnection *conn, const char *device)
+static char *get_adapter_path(DBusConnection *conn, const char *adapter)
{
DBusMessage *msg, *reply;
DBusError err;
const char *tmppath;
char *path, *default_path = "/org/bluez/hci0";
- if (device) {
- path = strdup(device);
+ if (adapter) {
+ path = strdup(adapter);
return path;
}
@@ -543,7 +543,7 @@ int main(int argc, char *argv[])
}
if (!adapter_path)
- adapter_path = get_device(conn, adapter_id);
+ adapter_path = get_adapter_path(conn, adapter_id);
if (target) {
if (create_paired_device(conn, adapter_path, agent_path,
--
1.6.3.3
next prev parent reply other threads:[~2009-07-02 9:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-02 9:14 [PATCH 1/5] test/agent.c: rename device into adapter in main Filippo Giunchedi
2009-07-02 9:14 ` [PATCH 2/5] test/agent.c: rename option device into adapter Filippo Giunchedi
2009-07-02 9:14 ` Filippo Giunchedi [this message]
2009-07-02 9:14 ` [PATCH 4/5] test/agent.c: find given adapter or use default Filippo Giunchedi
2009-07-02 9:14 ` [PATCH 5/5] test/agent.c: rename "target device" into device Filippo Giunchedi
2009-07-02 14:24 ` [PATCH 1/5] test/agent.c: rename device into adapter in main 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=1246526068-13364-3-git-send-email-filippo@esaurito.net \
--to=filippo@esaurito.net \
--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