From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 09/10] mesh: Rework set_scan_filter_uuids parameters
Date: Fri, 8 Dec 2017 08:52:55 -0200 [thread overview]
Message-ID: <20171208105256.18635-9-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20171208105256.18635-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
set_scan_filter_uuids is not a command handler which means it doesn't
need to take argc and argv instead just pass the filter array.
---
mesh/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mesh/main.c b/mesh/main.c
index 4d63c5751..4b9d65d6f 100644
--- a/mesh/main.c
+++ b/mesh/main.c
@@ -1596,16 +1596,16 @@ static void set_scan_filter_commit(void)
}
}
-static void set_scan_filter_uuids(int argc, char *argv[])
+static void set_scan_filter_uuids(char *filters[])
{
g_strfreev(filtered_scan_uuids);
filtered_scan_uuids = NULL;
filtered_scan_uuids_len = 0;
- if (!argc || !strlen(argv[0]))
+ if (!filters)
goto commit;
- filtered_scan_uuids = g_strdupv(argv);
+ filtered_scan_uuids = g_strdupv(filters);
if (!filtered_scan_uuids) {
bt_shell_printf("Failed to parse input\n");
return;
@@ -1627,7 +1627,7 @@ static void cmd_scan_unprovisioned_devices(int argc, char *argv[])
if (enable == TRUE) {
discover_mesh = false;
- set_scan_filter_uuids(1, filters);
+ set_scan_filter_uuids(filters);
}
cmd_scan(argc, argv);
}
@@ -1721,7 +1721,7 @@ static void cmd_connect(int argc, char *argv[])
g_dbus_proxy_method_call(default_ctrl->proxy, "StopDiscovery",
NULL, NULL, NULL, NULL);
- set_scan_filter_uuids(1, filters);
+ set_scan_filter_uuids(filters);
discover_mesh = true;
if (connection.unicast == UNASSIGNED_ADDRESS) {
@@ -1761,7 +1761,7 @@ static void prov_disconn_reply(DBusMessage *message, void *user_data)
set_connected_device(NULL);
- set_scan_filter_uuids(1, filters);
+ set_scan_filter_uuids(filters);
discover_mesh = true;
connection.type = CONN_TYPE_IDENTITY;
--
2.13.6
next prev parent reply other threads:[~2017-12-08 10:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-08 10:52 [PATCH v2 01/10] shared/shell: Omit menu command if there are no submenus Luiz Augusto von Dentz
2017-12-08 10:52 ` [PATCH v2 02/10] shared/shell: Don't remove command from arguments Luiz Augusto von Dentz
2017-12-08 10:52 ` [PATCH v2 03/10] mesh: Make meshctl use bt_shell helpers Luiz Augusto von Dentz
2017-12-08 10:52 ` [PATCH v2 04/10] tools/obexctl: Use " Luiz Augusto von Dentz
2017-12-08 10:52 ` [PATCH v2 05/10] tools/bluetooth-player: " Luiz Augusto von Dentz
2017-12-08 10:52 ` [PATCH v2 06/10] tools/bluetooth-player: Fix arg format for search command Luiz Augusto von Dentz
2017-12-08 10:52 ` [PATCH v2 07/10] client: Fix arguments of set-filter-clear Luiz Augusto von Dentz
2017-12-08 10:52 ` [PATCH v2 08/10] shell: Add bt_shell_opt Luiz Augusto von Dentz
2017-12-08 10:52 ` Luiz Augusto von Dentz [this message]
2017-12-08 10:52 ` [PATCH v2 10/10] mesh: Remove cmd_scan Luiz Augusto von Dentz
2017-12-08 11:10 ` [PATCH v2 01/10] shared/shell: Omit menu command if there are no submenus 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=20171208105256.18635-9-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--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).