Replace defensive NULL guards with assert() in vnc_display_close() and vnc_display_open(). These are internal functions whose callers guarantee non-NULL arguments, so a NULL value would indicate a programming error rather than a runtime condition.
Signed-off-by: Marc-André Lureau <[email protected]> --- ui/vnc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 87ec3e6d799..605e5117b7f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3464,9 +3464,7 @@ void vnc_display_init(const char *id, Error **errp) static void vnc_display_close(VncDisplay *vd) { - if (!vd) { - return; - } + assert(vd); if (vd->listener) { qio_net_listener_disconnect(vd->listener); @@ -4067,15 +4065,10 @@ void vnc_display_open(const char *id, Error **errp) const char *audiodev; const char *passwordSecret; - if (!vd) { - error_setg(errp, "VNC display not active"); - return; - } - vnc_display_close(vd); + assert(vd); + assert(opts); - if (!opts) { - return; - } + vnc_display_close(vd); reverse = qemu_opt_get_bool(opts, "reverse", false); if (vnc_display_get_addresses(opts, reverse, &saddr_list, &wsaddr_list, -- 2.53.0
