luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 12:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneccessary variable from g_cancellable_cancel()

Browse Source 
The variable makes a complicated function even more complicated.
This commit is contained in:
Benjamin Otte 2010-03-26 20:36:10 +01:00 committed by Ryan Lortie
parent c3f1025c33
commit 5527a2ac2c
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gio/gcancellable.c
View File

@ -613,7 +613,6 @@ g_cancellable_release_fd (GCancellable *cancellable)
void void
g_cancellable_cancel (GCancellable *cancellable) g_cancellable_cancel (GCancellable *cancellable)
{ {
gboolean cancel;
GCancellablePrivate *priv; GCancellablePrivate *priv;
if (cancellable == NULL || if (cancellable == NULL ||
@ -621,10 +620,9 @@ g_cancellable_cancel (GCancellable *cancellable)
return; return;
priv = cancellable->priv; priv = cancellable->priv;
cancel = FALSE;
G_LOCK(cancellable); G_LOCK(cancellable);
cancel = TRUE;
priv->cancelled = TRUE; priv->cancelled = TRUE;
priv->cancelled_running = TRUE; priv->cancelled_running = TRUE;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
@ -642,22 +640,19 @@ g_cancellable_cancel (GCancellable *cancellable)
} }
G_UNLOCK(cancellable); G_UNLOCK(cancellable);
if (cancel) g_object_ref (cancellable);
{ g_signal_emit (cancellable, signals[CANCELLED], 0);
g_object_ref (cancellable);
g_signal_emit (cancellable, signals[CANCELLED], 0);
G_LOCK(cancellable); G_LOCK(cancellable);
priv->cancelled_running = FALSE; priv->cancelled_running = FALSE;
if (priv->cancelled_running_waiting) if (priv->cancelled_running_waiting)
g_cond_broadcast (cancellable_cond); g_cond_broadcast (cancellable_cond);
priv->cancelled_running_waiting = FALSE; priv->cancelled_running_waiting = FALSE;
G_UNLOCK(cancellable); G_UNLOCK(cancellable);
g_object_unref (cancellable); g_object_unref (cancellable);
}
} }
/** /**