[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/9] ui: Clean up a few things checkpatch.pl would flag later on
From: |
Markus Armbruster |
Subject: |
[PATCH 4/9] ui: Clean up a few things checkpatch.pl would flag later on |
Date: |
Thu, 1 Dec 2022 07:13:06 +0100 |
Fix a few style violations so that checkpatch.pl won't complain when I
move this code.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/hmp-cmds.c | 7 ++++---
monitor/qmp-cmds.c | 21 +++++++++++----------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 86dd961462..29fcc730cb 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -591,9 +591,10 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict)
hmp_info_vnc_servers(mon, info->server);
hmp_info_vnc_clients(mon, info->clients);
if (!info->server) {
- /* The server entry displays its auth, we only
- * need to display in the case of 'reverse' connections
- * where there's no server.
+ /*
+ * The server entry displays its auth, we only need to
+ * display in the case of 'reverse' connections where
+ * there's no server.
*/
hmp_info_vnc_authcrypt(mon, " ", info->auth,
info->has_vencrypt ? &info->vencrypt : NULL);
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 054d7648b1..a7c95e8e39 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -190,8 +190,10 @@ void qmp_set_password(SetPasswordOptions *opts, Error
**errp)
error_setg(errp, QERR_INVALID_PARAMETER, "connected");
return;
}
- /* Note that setting an empty password will not disable login through
- * this interface. */
+ /*
+ * Note that setting an empty password will not disable login
+ * through this interface.
+ */
rc = vnc_display_password(opts->u.vnc.display, opts->password);
}
@@ -276,12 +278,10 @@ void qmp_add_client(const char *protocol, const char
*fdname,
error_setg(errp, "spice failed to add client");
close(fd);
}
- return;
#ifdef CONFIG_VNC
} else if (strcmp(protocol, "vnc") == 0) {
skipauth = has_skipauth ? skipauth : false;
vnc_display_add_client(NULL, fd, skipauth);
- return;
#endif
#ifdef CONFIG_DBUS_DISPLAY
} else if (strcmp(protocol, "@dbus-display") == 0) {
@@ -293,19 +293,20 @@ void qmp_add_client(const char *protocol, const char
*fdname,
close(fd);
return;
}
- return;
#endif
- } else if ((s = qemu_chr_find(protocol)) != NULL) {
+ } else {
+ s = qemu_chr_find(protocol);
+ if (!s) {
+ error_setg(errp, "protocol '%s' is invalid", protocol);
+ close(fd);
+ return;
+ }
if (qemu_chr_add_client(s, fd) < 0) {
error_setg(errp, "failed to add client");
close(fd);
return;
}
- return;
}
-
- error_setg(errp, "protocol '%s' is invalid", protocol);
- close(fd);
}
--
2.37.3
- [PATCH 0/9] ui: Move and clean up monitor command code, Markus Armbruster, 2022/12/01
- [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV, Markus Armbruster, 2022/12/01
- Re: [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV, Daniel P . Berrangé, 2022/12/01
- Re: [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV, Markus Armbruster, 2022/12/01
- Re: [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV, Markus Armbruster, 2022/12/01
- Re: [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV, Daniel P . Berrangé, 2022/12/01
- Re: [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV, Markus Armbruster, 2022/12/01
- Re: [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV, Daniel P . Berrangé, 2022/12/01
- Re: [PATCH 3/9] ui: Drop disabled code for SPICE_CHANNEL_WEBDAV, Markus Armbruster, 2022/12/02
[PATCH 4/9] ui: Clean up a few things checkpatch.pl would flag later on,
Markus Armbruster <=
[PATCH 1/9] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2022/12/01
[PATCH 2/9] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2022/12/01
[PATCH 7/9] ui: Improve "change vnc" error reporting, Markus Armbruster, 2022/12/01
[PATCH 8/9] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c, Markus Armbruster, 2022/12/01