luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-14 19:55:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/lantw/kqueue-Do-not-return-early-from-_kqsub_cancel' into 'master'

Browse Source 
kqueue: Do not return early from _kqsub_cancel

Closes #1935

See merge request GNOME/glib!1232
This commit is contained in:
Philip Withnall 2019-11-28 09:28:20 +00:00
commit a2fa23ab73
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/kqueue/gkqueuefilemonitor.c
View File

@ -122,7 +122,7 @@ static gboolean g_kqueue_file_monitor_is_supported (void);
static kqueue_sub *_kqsub_new (gchar *, gchar *, GKqueueFileMonitor *, GFileMonitorSource *); static kqueue_sub *_kqsub_new (gchar *, gchar *, GKqueueFileMonitor *, GFileMonitorSource *);
static void _kqsub_free (kqueue_sub *); static void _kqsub_free (kqueue_sub *);
static gboolean _kqsub_cancel (kqueue_sub *); static void _kqsub_cancel (kqueue_sub *);
#ifndef O_EVTONLY #ifndef O_EVTONLY
@ -547,7 +547,7 @@ _kqsub_free (kqueue_sub *sub)
g_slice_free (kqueue_sub, sub); g_slice_free (kqueue_sub, sub);
} }
static gboolean static void
_kqsub_cancel (kqueue_sub *sub) _kqsub_cancel (kqueue_sub *sub)
{ {
/* WARNING: Before calling this function, you must hold a lock on kq_lock /* WARNING: Before calling this function, you must hold a lock on kq_lock
@ -563,7 +563,6 @@ _kqsub_cancel (kqueue_sub *sub)
if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1) if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
{ {
g_warning ("Unable to remove event for %s: %s", sub->filename, g_strerror (errno)); g_warning ("Unable to remove event for %s: %s", sub->filename, g_strerror (errno));
return FALSE;
} }
close (sub->fd); close (sub->fd);
sub->fd = -1; sub->fd = -1;
@ -576,8 +575,6 @@ _kqsub_cancel (kqueue_sub *sub)
dl_free (sub->deps); dl_free (sub->deps);
sub->deps = NULL; sub->deps = NULL;
} }
return TRUE;
} }
gboolean gboolean