haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

vnc: drop Error pointer indirection in vnc_client_io_error

Browse source 
We don't need Error **, as all callers pass local Error object, which
isn't used after the call, or NULL. Use Error * instead.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20191205174635.18758-6-vsementsov@virtuozzo.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-12-05 20:46:19 +03:00 committed by Markus Armbruster
parent 187c614767
commit 34ab29c2ff
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ui/vnc.c
View file

@ -1312,7 +1312,7 @@ void vnc_disconnect_finish(VncState *vs)
g_free(vs); g_free(vs);
} }
size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp) size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error *err)
{ {
if (ret <= 0) { if (ret <= 0) {
if (ret == 0) { if (ret == 0) {
@ -1320,15 +1320,11 @@ size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp)
vnc_disconnect_start(vs); vnc_disconnect_start(vs);
} else if (ret != QIO_CHANNEL_ERR_BLOCK) { } else if (ret != QIO_CHANNEL_ERR_BLOCK) {
trace_vnc_client_io_error(vs, vs->ioc, trace_vnc_client_io_error(vs, vs->ioc,
errp ? error_get_pretty(*errp) : err ? error_get_pretty(err) : "Unknown");
"Unknown");
vnc_disconnect_start(vs); vnc_disconnect_start(vs);
} }
if (errp) { error_free(err);
error_free(*errp);
*errp = NULL;
}
return 0; return 0;
} }
return ret; return ret;
@ -1361,10 +1357,9 @@ size_t vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen)
{ {
Error *err = NULL; Error *err = NULL;
ssize_t ret; ssize_t ret;
ret = qio_channel_write( ret = qio_channel_write(vs->ioc, (const char *)data, datalen, &err);
vs->ioc, (const char *)data, datalen, &err);
VNC_DEBUG("Wrote wire %p %zd -> %ld\n", data, datalen, ret); VNC_DEBUG("Wrote wire %p %zd -> %ld\n", data, datalen, ret);
return vnc_client_io_error(vs, ret, &err); return vnc_client_io_error(vs, ret, err);
} }
@ -1488,10 +1483,9 @@ size_t vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen)
{ {
ssize_t ret; ssize_t ret;
Error *err = NULL; Error *err = NULL;
ret = qio_channel_read( ret = qio_channel_read(vs->ioc, (char *)data, datalen, &err);
vs->ioc, (char *)data, datalen, &err);
VNC_DEBUG("Read wire %p %zd -> %ld\n", data, datalen, ret); VNC_DEBUG("Read wire %p %zd -> %ld\n", data, datalen, ret);
return vnc_client_io_error(vs, ret, &err); return vnc_client_io_error(vs, ret, err);
} }

2
ui/vnc.h
View file

@ -547,7 +547,7 @@ uint32_t read_u32(uint8_t *data, size_t offset);
/* Protocol stage functions */ /* Protocol stage functions */
void vnc_client_error(VncState *vs); void vnc_client_error(VncState *vs);
size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp); size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error *err);
void start_client_init(VncState *vs); void start_client_init(VncState *vs);
void start_auth_vnc(VncState *vs); void start_auth_vnc(VncState *vs);