From: Filippo Giunchedi <filippo@esaurito.net>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 5/5] test/agent.c: rename "target device" into device
Date: Thu, 2 Jul 2009 11:14:28 +0200 [thread overview]
Message-ID: <1246526068-13364-5-git-send-email-filippo@esaurito.net> (raw)
In-Reply-To: <1246526068-13364-1-git-send-email-filippo@esaurito.net>
---
test/agent.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/test/agent.c b/test/agent.c
index b625b88..4c12ea3 100644
--- a/test/agent.c
+++ b/test/agent.c
@@ -374,7 +374,7 @@ static int unregister_agent(DBusConnection *conn, const char *adapter_path,
static int create_paired_device(DBusConnection *conn, const char *adapter_path,
const char *agent_path,
const char *capabilities,
- const char *target)
+ const char *device)
{
dbus_bool_t success;
DBusMessage *msg;
@@ -387,7 +387,7 @@ static int create_paired_device(DBusConnection *conn, const char *adapter_path,
return -1;
}
- dbus_message_append_args(msg, DBUS_TYPE_STRING, &target,
+ dbus_message_append_args(msg, DBUS_TYPE_STRING, &device,
DBUS_TYPE_OBJECT_PATH, &agent_path,
DBUS_TYPE_STRING, &capabilities,
DBUS_TYPE_INVALID);
@@ -521,7 +521,7 @@ static void usage(void)
printf("Bluetooth agent ver %s\n\n", VERSION);
printf("Usage:\n"
- "\tagent [--adapter adapter-path] [--path agent-path] <passkey> [<target_device>]\n"
+ "\tagent [--adapter adapter-path] [--path agent-path] <passkey> [<device>]\n"
"\n");
}
@@ -540,7 +540,7 @@ int main(int argc, char *argv[])
struct sigaction sa;
DBusConnection *conn;
char match_string[128], default_path[128], *adapter_id = NULL;
- char *adapter_path = NULL, *agent_path = NULL, *target = NULL;
+ char *adapter_path = NULL, *agent_path = NULL, *device = NULL;
int opt;
snprintf(default_path, sizeof(default_path),
@@ -584,7 +584,7 @@ int main(int argc, char *argv[])
passkey = strdup(argv[0]);
if (argc > 1)
- target = strdup(argv[1]);
+ device = strdup(argv[1]);
if (!agent_path)
agent_path = strdup(default_path);
@@ -599,9 +599,9 @@ int main(int argc, char *argv[])
if (!adapter_path)
exit(1);
- if (target) {
+ if (device) {
if (create_paired_device(conn, adapter_path, agent_path,
- capabilities, target) < 0) {
+ capabilities, device) < 0) {
dbus_connection_unref(conn);
exit(1);
}
@@ -633,7 +633,7 @@ int main(int argc, char *argv[])
break;
}
- if (!__io_terminated && !target)
+ if (!__io_terminated && !device)
unregister_agent(conn, adapter_path, agent_path);
free(adapter_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 ` [PATCH 3/5] test/agent.c: rename device into adapter in functions Filippo Giunchedi
2009-07-02 9:14 ` [PATCH 4/5] test/agent.c: find given adapter or use default Filippo Giunchedi
2009-07-02 9:14 ` Filippo Giunchedi [this message]
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-5-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