io: use g_clear_handle_id() for GSource cleanup
PATCH 3/8 io: 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]>
--- io/channel-websock.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
io/channel-websock.c +5 -16
@@ -950,12 +950,8 @@ static void qio_channel_websock_finalize(Object *obj)buffer_free (&ioc->encinput);buffer_free (&ioc->encoutput);buffer_free (&ioc->rawinput); -if (ioc->hs_io_tag) { -g_source_remove (ioc->hs_io_tag); - } -if (ioc->io_tag) { -g_source_remove (ioc->io_tag); - } +g_clear_handle_id (&ioc->hs_io_tag, g_source_remove); +g_clear_handle_id (&ioc->io_tag, g_source_remove);error_free (ioc->io_err);object_unref (OBJECT (ioc->master)); }
@@ -1070,10 +1066,7 @@ static gboolean qio_channel_websock_flush(QIOChannel *ioc,static void qio_channel_websock_unset_watch (QIOChannelWebsock *ioc) { -if (ioc->io_tag) { -g_source_remove (ioc->io_tag); - ioc->io_tag =0 ; - } +g_clear_handle_id (&ioc->io_tag, g_source_remove); }static void qio_channel_websock_set_watch (QIOChannelWebsock *ioc)
@@ -1250,12 +1243,8 @@ static int qio_channel_websock_close(QIOChannel *ioc,buffer_free (&wioc->encinput);buffer_free (&wioc->encoutput);buffer_free (&wioc->rawinput); -if (wioc->hs_io_tag) { -g_clear_handle_id (&wioc->hs_io_tag, g_source_remove); - } -if (wioc->io_tag) { -g_clear_handle_id (&wioc->io_tag, g_source_remove); - } +g_clear_handle_id (&wioc->hs_io_tag, g_source_remove); +g_clear_handle_id (&wioc->io_tag, g_source_remove);if (wioc->io_err) {g_clear_pointer (&wioc->io_err, error_free); }
Signature · 1 line
2.53.0