Attachment #310153 for bug #413331

View | Details | Raw Unified | Return to bug 413331
Collapse All | Expand All





/**
 * Cancels a subscription which was being monitored.
 * inotify_lock must be held when calling.
 */
static gboolean
ih_sub_cancel (ih_sub_t * sub)
{
	G_LOCK(inotify_lock);


	if (!sub->cancelled)
	{
		IH_W("cancelling %s\n", sub->pathname);

		sub_list = g_list_remove (sub_list, sub);
	}

	G_UNLOCK(inotify_lock);
	return TRUE;
}


Lines 34-40 gboolean ih_startup (event_callback_t ecb, Link Here

(-)a/server/inotify-helper.h (-2 lines)
34	found_callback_t fcb);	34	found_callback_t fcb);
35	gboolean ih_running (void);	35	gboolean ih_running (void);
36	gboolean ih_sub_add (ih_sub_t *sub);	36	gboolean ih_sub_add (ih_sub_t *sub);
37	gboolean ih_sub_cancel (ih_sub_t *sub);
38		37
39	/* Return FALSE from 'f' if the subscription should be cancelled */	38	/* Return FALSE from 'f' if the subscription should be cancelled */
40	void ih_sub_foreach (void callerdata, gboolean (f)(ih_sub_t sub, void callerdata));	39	void ih_sub_foreach (void callerdata, gboolean (f)(ih_sub_t sub, void callerdata));
41	-

Return to bug 413331

Lines 123-135 ih_sub_add (ih_sub_t * sub) Link Here

(-)a/server/inotify-helper.c (-5 / +2 lines)
123		123
124	/**	124	/**
125	* Cancels a subscription which was being monitored.	125	* Cancels a subscription which was being monitored.
		126	* inotify_lock must be held when calling.
126	*/	127	*/
127	gboolean	128	static gboolean
128	ih_sub_cancel (ih_sub_t * sub)	129	ih_sub_cancel (ih_sub_t * sub)
129	{	130	{
130	G_LOCK(inotify_lock);
131
132
133	if (!sub->cancelled)	131	if (!sub->cancelled)
134	{	132	{
135	IH_W("cancelling %s\n", sub->pathname);	133	IH_W("cancelling %s\n", sub->pathname);
Lines 140-146 ih_sub_cancel (ih_sub_t * sub) Link Here
140	sub_list = g_list_remove (sub_list, sub);	138	sub_list = g_list_remove (sub_list, sub);
141	}	139	}
142		140
143	G_UNLOCK(inotify_lock);
144	return TRUE;	141	return TRUE;
145	}	142	}
146		143