[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/17] ui: Reduce nesting in hmp_change_vnc() slightly
From: |
Markus Armbruster |
Subject: |
[PULL 14/17] ui: Reduce nesting in hmp_change_vnc() slightly |
Date: |
Thu, 19 Jan 2023 14:27:10 +0100 |
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>
Message-Id: <20230109190321.1056914-15-armbru@redhat.com>
---
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
- [PULL 00/17] Monitor patches for 2023-01-19, Markus Armbruster, 2023/01/19
- [PULL 16/17] ui: Split hmp_mouse_set() and move the HMP part to ui/, Markus Armbruster, 2023/01/19
- [PULL 15/17] ui: Don't check for mode change after mouse_set error, Markus Armbruster, 2023/01/19
- [PULL 09/17] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c, Markus Armbruster, 2023/01/19
- [PULL 03/17] ui/spice: Require spice-protocol >= 0.14.0, Markus Armbruster, 2023/01/19
- [PULL 04/17] Revert "hmp: info spice: take out webdav", Markus Armbruster, 2023/01/19
- [PULL 05/17] ui/spice: Require spice-server >= 0.14.0, Markus Armbruster, 2023/01/19
- [PULL 10/17] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c, Markus Armbruster, 2023/01/19
- [PULL 02/17] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2023/01/19
- [PULL 11/17] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c, Markus Armbruster, 2023/01/19
- [PULL 14/17] ui: Reduce nesting in hmp_change_vnc() slightly,
Markus Armbruster <=
- [PULL 13/17] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c, Markus Armbruster, 2023/01/19
- [PULL 17/17] ui: Simplify control flow in qemu_mouse_set(), Markus Armbruster, 2023/01/19
- [PULL 07/17] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2023/01/19
- [PULL 08/17] ui: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2023/01/19
- [PULL 12/17] ui: Improve "change vnc" error reporting, Markus Armbruster, 2023/01/19
- [PULL 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, drop, Markus Armbruster, 2023/01/19
- [PULL 01/17] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2023/01/19
- Re: [PULL 00/17] Monitor patches for 2023-01-19, Peter Maydell, 2023/01/20