[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 04/15] android-console: Consolidate redir help te
From: |
Greg Bellows |
Subject: |
[Qemu-devel] [PATCH v1 04/15] android-console: Consolidate redir help text |
Date: |
Tue, 11 Nov 2014 18:25:52 -0600 |
Consolidated the Android emulator console help text for the redir command to
make the hndler functions more readable. This establishes the pattern to be
used for each command added in the future.
Signed-off-by: Greg Bellows <address@hidden>
---
android-console.c | 50 ++++++++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/android-console.c b/android-console.c
index 2de4a0c..0be5949 100644
--- a/android-console.c
+++ b/android-console.c
@@ -240,11 +240,24 @@ void android_console_redir_remove(Monitor *mon, const
QDict *qdict)
}
#endif
-static const char *redir_list_help =
- "list current port redirections. "
- "use 'redir add' and 'redir del' to add and remove them\n";
-
-static const char *redir_add_help =
+enum {
+ CMD_REDIR,
+ CMD_REDIR_LIST,
+ CMD_REDIR_ADD,
+ CMD_REDIR_DEL,
+};
+
+static const char *redir_help[] = {
+ /* CMD_REDIR */
+ "allows you to add, list and remove UDP and/or PORT redirection "
+ "from the host to the device\n"
+ "as an example, 'redir tcp:5000:6000' will route any packet sent "
+ "to the host's TCP port 5000\n"
+ "to TCP port 6000 of the emulated device",
+ /* CMD_REDIR_LIST */
+ "list current port redirections. use 'redir add' and 'redir del' to add "
+ "and remove them",
+ /* CMD_REDIR_ADD */
"add a new port redirection, arguments must be:\n"
"\n"
" redir add <protocol>:<host-port>:<guest-port>\n"
@@ -257,34 +270,31 @@ static const char *redir_add_help =
"\n"
"as an example, 'redir tcp:5000:6000' will allow any packets sent to\n"
"the host's TCP port 5000 to be routed to TCP port 6000 of the "
- "emulated device\n";
-
-static const char *redir_del_help =
+ "emulated device",
+ /* CMD_REDIR_DEL */
"remove a port redirecion that was created with 'redir add', "
"arguments must be:\n"
" redir del <protocol>:<host-port>\n\n"
- "see the 'help redir add' for the meaning of <protocol> and <host-port>\n";
+ "see the 'help redir add' for the meaning of <protocol> and <host-port>",
+};
void android_console_redir(Monitor *mon, const QDict *qdict)
{
/* This only gets called for bad subcommands and help requests */
const char *helptext = qdict_get_try_str(qdict, "helptext");
+ /* Default to the first entry which is the parent help message */
+ int cmd = CMD_REDIR;
+
if (helptext) {
if (strstr(helptext, "add")) {
- monitor_printf(mon, "%s", redir_add_help);
- return;
+ cmd = CMD_REDIR_ADD;
} else if (strstr(helptext, "del")) {
- monitor_printf(mon, "%s", redir_del_help);
- return;
+ cmd = CMD_REDIR_DEL;
} else if (strstr(helptext, "list")) {
- monitor_printf(mon, "%s", redir_list_help);
- return;
+ cmd = CMD_REDIR_LIST;
}
}
- monitor_printf(mon, "allows you to add, list and remove and/or "
- "PORT redirection from the host to the device\n"
- "as an example, 'redir tcp:5000:6000' will route "
- "any packet sent to the host's TCP port 5000\n"
- "to TCP port 6000 of the emulated device\n");
+ monitor_printf(mon, "%s\n", redir_help[cmd]);
}
+
--
1.8.3.2
- [Qemu-devel] [PATCH v1 00/15] android-console: Add console power command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 01/15] android-console: Fix goldfish audio misnaming, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 02/15] android-console: Unify available commands output, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 03/15] android-console: Remove extra redir help message, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 04/15] android-console: Consolidate redir help text,
Greg Bellows <=
- [Qemu-devel] [PATCH v1 05/15] android-console: Add console base power command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 09/15] android-console: Add GF battery prop print func, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 06/15] android-console: Add missing hw_has_battery prop, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 08/15] android-console: Add header for battery externs, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 07/15] android-console: Init the battery ID state field, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 10/15] android-console: Add GF battery property getter, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 12/15] android-console: Add power status command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 11/15] android-console: Add power ac command, Greg Bellows, 2014/11/11