ui: use g_clear_handle_id() for GSource cleanup
PATCH 8/8 ui: use g_clear_handle_id() for GSource cleanup
Use g_clear_handle_id() instead of g_source_remove() with manual ID checking and zeroing.
This simplifies the code and ensures consistent handling of GSource IDs, since g_clear_handle_id() checks for a non-zero ID before calling the cleanup function and zeros it afterwards.
No functional change intended.
Signed-off-by Matthew Penney <[email protected]>
--- ui/dbus-clipboard.c | 6 ++---- ui/input-barrier.c | 5 +---- ui/vnc-auth-sasl.c | 4 +--- ui/vnc-auth-vencrypt.c | 9 ++------- ui/vnc-ws.c | 18 ++++-------------- 5 files changed, 10 insertions(+), 32 deletions(-)
ui/dbus-clipboard.c +2 -4
@@ -80,8 +80,7 @@ dbus_clipboard_update_info(DBusDisplay *dpy, QemuClipboardInfo *info)if (req->invocation && info->types[req->type].data) {dbus_clipboard_complete_request (dpy, req->invocation, info, req->type);g_clear_object (&req->invocation); -g_source_remove (req->timeout_id); - req->timeout_id =0 ; +g_clear_handle_id (&req->timeout_id, g_source_remove);return ; }
@@ -183,8 +182,7 @@ dbus_clipboard_request_cancelled(DBusClipboardRequest *req) "Cancelled clipboard request");g_clear_object (&req->invocation); -g_source_remove (req->timeout_id); - req->timeout_id =0 ; +g_clear_handle_id (&req->timeout_id, g_source_remove); } static void
ui/input-barrier.c +1 -4
@@ -519,10 +519,7 @@ static void input_barrier_instance_finalize(Object *obj) {InputBarrier *ib =INPUT_BARRIER (obj); -if (ib->ioc_tag) { -g_source_remove (ib->ioc_tag); - ib->ioc_tag =0 ; - } +g_clear_handle_id (&ib->ioc_tag, g_source_remove);if (ib->sioc) {qio_channel_close (QIO_CHANNEL (ib->sioc),NULL );
ui/vnc-auth-sasl.c +1 -3
@@ -127,9 +127,7 @@ size_t vnc_client_write_sasl(VncState *vs)* SASL encoded output */ if (vs->output.offset ==0 ) { -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } +g_clear_handle_id (&vs->ioc_tag, g_source_remove); vs->ioc_tag =qio_channel_add_watch ( vs->ioc,G_IO_IN |G_IO_HUP |G_IO_ERR , vnc_client_io, vs,NULL );
ui/vnc-auth-vencrypt.c +2 -7
@@ -75,9 +75,7 @@ static void vnc_tls_handshake_done(QIOTask *task,vnc_client_error (vs);error_free (err); }else { -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } +g_clear_handle_id (&vs->ioc_tag, g_source_remove); vs->ioc_tag =qio_channel_add_watch ( vs->ioc,G_IO_IN |G_IO_HUP |G_IO_ERR |G_IO_OUT , vnc_client_io, vs,NULL );
@@ -102,10 +100,7 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t lenvnc_write_u8 (vs,1 );/* Accept auth */ vnc_flush (vs); -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - vs->ioc_tag =0 ; - } +g_clear_handle_id (&vs->ioc_tag, g_source_remove); tls = qio_channel_tls_new_server( vs->ioc,
ui/vnc-ws.c +4 -14
@@ -37,9 +37,7 @@ static void vncws_tls_handshake_done(QIOTask *task,error_free (err); }else {VNC_DEBUG ("TLS handshake complete, starting websocket handshake\n" ); -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } +g_clear_handle_id (&vs->ioc_tag, g_source_remove); vs->ioc_tag =qio_channel_add_watch (vs->ioc,G_IO_IN |G_IO_HUP |G_IO_ERR , vncws_handshake_io, vs,NULL );
@@ -55,10 +53,7 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,QIOChannelTLS *tls;Error *err =NULL ; -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - vs->ioc_tag =0 ; - } +g_clear_handle_id (&vs->ioc_tag, g_source_remove);if (condition & (G_IO_HUP |G_IO_ERR )) {vnc_client_error (vs);
@@ -107,9 +102,7 @@ static void vncws_handshake_done(QIOTask *task, }else {VNC_DEBUG ("Websock handshake complete, starting VNC protocol\n" );vnc_start_protocol (vs); -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - } +g_clear_handle_id (&vs->ioc_tag, g_source_remove); vs->ioc_tag =qio_channel_add_watch ( vs->ioc,G_IO_IN |G_IO_HUP |G_IO_ERR , vnc_client_io, vs,NULL );
@@ -124,10 +117,7 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,VncState *vs = opaque;QIOChannelWebsock *wioc; -if (vs->ioc_tag) { -g_source_remove (vs->ioc_tag); - vs->ioc_tag =0 ; - } +g_clear_handle_id (&vs->ioc_tag, g_source_remove);if (condition & (G_IO_HUP |G_IO_ERR )) {vnc_client_error (vs);
Signature · 1 line
2.53.0