[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 02/13] ui: remove unreachable code in vnc_update_
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v1 02/13] ui: remove unreachable code in vnc_update_client |
Date: |
Mon, 18 Dec 2017 19:12:17 +0000 |
A previous commit:
commit 5a8be0f73d6f60ff08746377eb09ca459f39deab
Author: Gerd Hoffmann <address@hidden>
Date: Wed Jul 13 12:21:20 2016 +0200
vnc: make sure we finish disconnect
Added a check for vs->disconnecting at the very start of the
vnc_update_client method. This means that the very next "if"
statement check for !vs->disconnecting always evaluates true,
and is thus redundant. This in turn means the vs->disconnecting
check at the very end of the method never evaluates true, and
is thus unreachable code.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
ui/vnc.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 7ba3297dfa..869c75bbcf 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -969,7 +969,7 @@ static int vnc_update_client(VncState *vs, int has_dirty)
}
vs->has_dirty += has_dirty;
- if (vs->need_update && !vs->disconnecting) {
+ if (vs->need_update) {
VncDisplay *vd = vs->vd;
VncJob *job;
int y;
@@ -1030,10 +1030,6 @@ static int vnc_update_client(VncState *vs, int has_dirty)
return n;
}
- if (vs->disconnecting) {
- vnc_disconnect_finish(vs);
- }
-
return 0;
}
--
2.14.3
- [Qemu-devel] [PATCH v1 00/13] Fix VNC server unbounded memory usage, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 01/13] ui: remove 'sync' parametr from vnc_update_client, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 03/13] ui: remove redundant indentation in vnc_client_update, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 06/13] ui: introduce enum to track VNC client framebuffer update request state, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 02/13] ui: remove unreachable code in vnc_update_client,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v1 04/13] ui: avoid pointless VNC updates if framebuffer isn't dirty, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 08/13] ui: refactor code for determining if an update should be sent to the client, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 11/13] ui: place a hard cap on VNC server output buffer size, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 07/13] ui: correctly reset framebuffer update state after processing dirty regions, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 10/13] ui: fix VNC client throttling when forced update is requested, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 05/13] ui: track how much decoded data we consumed when doing SASL encoding, Daniel P. Berrange, 2017/12/18