From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ 1/7] shared/shell: Omit menu command if there are no submenus
Date: Thu, 7 Dec 2017 10:21:46 -0200 [thread overview]
Message-ID: <20171207122152.29743-1-luiz.dentz@gmail.com> (raw)
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
There is no need to show menu as a command if there are no submenus
to select.
---
src/shared/shell.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/shared/shell.c b/src/shared/shell.c
index 0878cad3b..d262f534b 100644
--- a/src/shared/shell.c
+++ b/src/shared/shell.c
@@ -195,8 +195,11 @@ static void shell_print_menu(void)
}
for (entry = default_menu; entry->cmd; entry++) {
- /* Skip menu command if not on main menu */
- if (data.menu != data.main && !strcmp(entry->cmd, "menu"))
+ /* Skip menu command if not on main menu or if there are no
+ * submenus.
+ */
+ if ((data.menu != data.main && !strcmp(entry->cmd, "menu")) ||
+ queue_isempty(data.submenus))
continue;
/* Skip back command if on main menu */
--
2.13.6
next reply other threads:[~2017-12-07 12:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 12:21 Luiz Augusto von Dentz [this message]
2017-12-07 12:21 ` [PATCH BlueZ 2/7] shared/shell: Don't remove command from arguments Luiz Augusto von Dentz
2017-12-07 12:21 ` [PATCH BlueZ 3/7] mesh: Make meshctl use bt_shell helpers Luiz Augusto von Dentz
2017-12-08 7:01 ` Johan Hedberg
2017-12-08 10:53 ` Luiz Augusto von Dentz
2017-12-07 12:21 ` [PATCH BlueZ 4/7] tools/obexctl: Use " Luiz Augusto von Dentz
2017-12-07 12:21 ` [PATCH BlueZ 5/7] tools/bluetooth-player: " Luiz Augusto von Dentz
2017-12-07 12:21 ` [PATCH BlueZ 6/7] tools/bluetooth-player: Fix arg format for search command Luiz Augusto von Dentz
2017-12-07 12:21 ` [PATCH BlueZ 7/7] client: Fix arguments of set-filter-clear Luiz Augusto von Dentz
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=20171207122152.29743-1-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.