From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kraxel@redhat.com, dgilbert@redhat.com, berrange@redhat.com,
philmd@linaro.org
Subject: [PATCH v4 14/17] ui: Reduce nesting in hmp_change_vnc() slightly
Date: Mon, 9 Jan 2023 20:03:18 +0100 [thread overview]
Message-ID: <20230109190321.1056914-15-armbru@redhat.com> (raw)
In-Reply-To: <20230109190321.1056914-1-armbru@redhat.com>
Transform
if (good) {
do stuff
} else {
handle error
}
to
if (!good) {
handle error
return;
}
do stuff
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
ui/ui-hmp-cmds.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c
index 8ae96749f3..7ca80c8626 100644
--- a/ui/ui-hmp-cmds.c
+++ b/ui/ui-hmp-cmds.c
@@ -328,19 +328,16 @@ void hmp_change_vnc(Monitor *mon, const char *device, const char *target,
error_setg(errp, "Parameter 'read-only-mode' is invalid for VNC");
return;
}
- if (strcmp(target, "passwd") == 0 ||
- strcmp(target, "password") == 0) {
- if (!arg) {
- MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
- monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
- return;
- } else {
- qmp_change_vnc_password(arg, errp);
- }
- } else {
+ if (strcmp(target, "passwd") && strcmp(target, "password")) {
error_setg(errp, "Expected 'password' after 'vnc'");
return;
}
+ if (!arg) {
+ MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
+ monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
+ } else {
+ qmp_change_vnc_password(arg, errp);
+ }
}
#endif
--
2.39.0
next prev parent reply other threads:[~2023-01-09 19:09 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 19:03 [PATCH v4 00/17] ui: Move and clean up monitor command code Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 01/17] ui: Check numeric part of expire_password argument @time properly Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 02/17] ui: Fix silent truncation of numeric keys in HMP sendkey Markus Armbruster
2023-01-10 7:22 ` Philippe Mathieu-Daudé
2023-01-09 19:03 ` [PATCH v4 03/17] ui/spice: Require spice-protocol >= 0.14.0 Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 04/17] Revert "hmp: info spice: take out webdav" Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 05/17] ui/spice: Require spice-server >= 0.14.0 Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, drop Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 07/17] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 08/17] ui: Clean up a few things checkpatch.pl would flag later on Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 09/17] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 10/17] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 11/17] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 12/17] ui: Improve "change vnc" error reporting Markus Armbruster
2023-01-09 19:03 ` [PATCH v4 13/17] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c Markus Armbruster
2023-01-09 19:03 ` Markus Armbruster [this message]
2023-01-09 19:03 ` [PATCH v4 15/17] ui: Don't check for mode change after mouse_set error Markus Armbruster
2023-01-10 7:23 ` Philippe Mathieu-Daudé
2023-01-10 9:04 ` Daniel P. Berrangé
2023-01-09 19:03 ` [PATCH v4 16/17] ui: Split hmp_mouse_set() and move the HMP part to ui/ Markus Armbruster
2023-01-10 7:24 ` Philippe Mathieu-Daudé
2023-01-10 9:05 ` Daniel P. Berrangé
2023-01-09 19:03 ` [PATCH v4 17/17] ui: Simplify control flow in qemu_mouse_set() Markus Armbruster
2023-01-10 7:25 ` Philippe Mathieu-Daudé
2023-01-10 9:06 ` Daniel P. Berrangé
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=20230109190321.1056914-15-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kraxel@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.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).