[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 15/18] ui: Reduce nesting in hmp_change_vnc() slightly
From: |
Markus Armbruster |
Subject: |
[PATCH v3 15/18] ui: Reduce nesting in hmp_change_vnc() slightly |
Date: |
Tue, 20 Dec 2022 10:06:42 +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>
---
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 41d934acb9..adea425d35 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.38.1
- [PATCH v3 01/18] ui: Check numeric part of expire_password argument @time properly, (continued)
- [PATCH v3 01/18] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2022/12/20
- [PATCH v3 13/18] ui: Improve "change vnc" error reporting, Markus Armbruster, 2022/12/20
- [PATCH v3 18/18] ui: Simplify control flow in qemu_mouse_set(), Markus Armbruster, 2022/12/20
- [PATCH v3 07/18] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2022/12/20
- [PATCH v3 06/18] ui/spice: QXLInterface method set_mm_time() is now dead, drop, Markus Armbruster, 2022/12/20
- [PATCH v3 03/18] ui/spice: Require spice-protocol >= 0.14.0, Markus Armbruster, 2022/12/20
- [PATCH v3 14/18] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c, Markus Armbruster, 2022/12/20
- [PATCH v3 15/18] ui: Reduce nesting in hmp_change_vnc() slightly,
Markus Armbruster <=
- [PATCH v3 12/18] ui: Move more HMP commands from monitor to ui/, Markus Armbruster, 2022/12/20
[PATCH v3 05/18] ui/spice: Require spice-server >= 0.14.0, Markus Armbruster, 2022/12/20
[PATCH v3 11/18] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c, Markus Armbruster, 2022/12/20
[PATCH v3 08/18] ui: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2022/12/20