diff options
| author | Greg Bellows <greg.bellows@linaro.org> | 2014-11-11 13:27:05 -0600 |
|---|---|---|
| committer | Greg Bellows <greg.bellows@linaro.org> | 2015-01-15 16:18:42 -0600 |
| commit | edb1f11daaec2deb65cdafdd02753a1e4025aba2 (patch) | |
| tree | 09e5eda7225a19e1b0019579a6fe4517b1ebfbef | |
| parent | a52c04bb4deaedcf0c995b0c597ce0dc6f0bceff (diff) | |
android-console: Fix OK message output
Adjusted "OK" message to be shared by all cases to avoid duplicates and
need for all help output to print. Alse added missing "OK" after the top
most help output.
Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
| -rw-r--r-- | android-console.c | 20 | ||||
| -rw-r--r-- | monitor.c | 2 |
2 files changed, 6 insertions, 16 deletions
diff --git a/android-console.c b/android-console.c index c2e41da74..be573b50f 100644 --- a/android-console.c +++ b/android-console.c @@ -242,8 +242,7 @@ void android_console_redir_remove(Monitor *mon, const QDict *qdict) static const char *redir_list_help = "list current port redirections. " - "use 'redir add' and 'redir del' to add and remove them\n" - "OK\n"; + "use 'redir add' and 'redir del' to add and remove them\n"; static const char *redir_add_help = "add a new port redirection, arguments must be:\n" @@ -258,15 +257,13 @@ 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" - "OK\n"; + "emulated device\n"; static const char *redir_del_help = "remove a port redirecion that was created with 'redir add', " - "arguments must be:\n\n" + "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" - "OK\n"; + "see the 'help redir add' for the meaning of <protocol> and <host-port>\n"; void android_console_redir(Monitor *mon, const QDict *qdict) { @@ -291,12 +288,5 @@ void android_console_redir(Monitor *mon, const QDict *qdict) "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" - "\n" - "available sub-commands:\n" - " list list current redirections\n" - " add add new redirection\n" - " del remove existing redirection\n" - "\n%s\n", - helptext ? "OK" : "KO: missing sub-command"); + "to TCP port 6000 of the emulated device\n"); } @@ -928,7 +928,7 @@ static void android_console_help(Monitor *mon, const QDict *qdict) monitor_printf(mon, " %-15s %s\n", cmd->name, cmd->help); } monitor_printf(mon, - "\ntry 'help <command>' for command-specific help\n"); + "\ntry 'help <command>' for command-specific help\nOK\n"); return; } |