diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/threads/Semaphore.c | |
parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/threads/Semaphore.c')
-rw-r--r-- | src/threads/Semaphore.c | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c index 5a3b050..c93420b 100644 --- a/src/threads/Semaphore.c +++ b/src/threads/Semaphore.c @@ -1,4 +1,4 @@ -/* Semaphore.c generated by valac 0.34.7, the Vala compiler +/* Semaphore.c generated by valac 0.36.6, the Vala compiler * generated from Semaphore.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -183,7 +183,7 @@ static AbstractSemaphoreWaitAction abstract_semaphore_real_do_wait (AbstractSema gboolean abstract_semaphore_reset (AbstractSemaphore* self); gboolean abstract_semaphore_do_reset (AbstractSemaphore* self); static gboolean abstract_semaphore_real_do_reset (AbstractSemaphore* self); -static void abstract_semaphore_finalize (AbstractSemaphore* obj); +static void abstract_semaphore_finalize (AbstractSemaphore * obj); GType semaphore_get_type (void) G_GNUC_CONST; #define SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEMAPHORE, SemaphorePrivate)) enum { @@ -193,7 +193,7 @@ Semaphore* semaphore_new (void); Semaphore* semaphore_construct (GType object_type); static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore* base); static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* base); -static void semaphore_finalize (AbstractSemaphore* obj); +static void semaphore_finalize (AbstractSemaphore * obj); GType countdown_semaphore_get_type (void) G_GNUC_CONST; #define COUNTDOWN_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphorePrivate)) enum { @@ -203,7 +203,7 @@ CountdownSemaphore* countdown_semaphore_new (gint total); CountdownSemaphore* countdown_semaphore_construct (GType object_type, gint total); static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (AbstractSemaphore* base); static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSemaphore* base); -static void countdown_semaphore_finalize (AbstractSemaphore* obj); +static void countdown_semaphore_finalize (AbstractSemaphore * obj); GType event_semaphore_get_type (void) G_GNUC_CONST; #define EVENT_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_SEMAPHORE, EventSemaphorePrivate)) enum { @@ -214,7 +214,7 @@ EventSemaphore* event_semaphore_construct (GType object_type); static AbstractSemaphoreNotifyAction event_semaphore_real_do_notify (AbstractSemaphore* base); static AbstractSemaphoreWaitAction event_semaphore_real_do_wait (AbstractSemaphore* base); static gboolean event_semaphore_real_do_reset (AbstractSemaphore* base); -static void event_semaphore_finalize (AbstractSemaphore* obj); +static void event_semaphore_finalize (AbstractSemaphore * obj); static void _vala_clear_GMutex (GMutex * mutex); static void _vala_clear_GRecMutex (GRecMutex * mutex); static void _vala_clear_GRWLock (GRWLock * mutex); @@ -260,8 +260,8 @@ GType abstract_semaphore_wait_action_get_type (void) { AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSemaphoreType type) { AbstractSemaphore* self = NULL; gboolean _tmp0_ = FALSE; - AbstractSemaphoreType _tmp1_ = 0; - AbstractSemaphoreType _tmp3_ = 0; + AbstractSemaphoreType _tmp1_; + AbstractSemaphoreType _tmp3_; #line 30 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = (AbstractSemaphore*) g_type_create_instance (object_type); #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -272,7 +272,7 @@ AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSema _tmp0_ = TRUE; #line 274 "Semaphore.c" } else { - AbstractSemaphoreType _tmp2_ = 0; + AbstractSemaphoreType _tmp2_; #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp2_ = type; #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -292,7 +292,7 @@ AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSema static void abstract_semaphore_trigger (AbstractSemaphore* self) { - AbstractSemaphoreType _tmp0_ = 0; + AbstractSemaphoreType _tmp0_; #line 36 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self)); #line 37 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -312,8 +312,8 @@ static void abstract_semaphore_trigger (AbstractSemaphore* self) { void abstract_semaphore_notify (AbstractSemaphore* self) { AbstractSemaphoreNotifyAction action = 0; - AbstractSemaphoreNotifyAction _tmp0_ = 0; - AbstractSemaphoreNotifyAction _tmp1_ = 0; + AbstractSemaphoreNotifyAction _tmp0_; + AbstractSemaphoreNotifyAction _tmp1_; #line 43 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self)); #line 44 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -346,7 +346,7 @@ void abstract_semaphore_notify (AbstractSemaphore* self) { } default: { - AbstractSemaphoreNotifyAction _tmp2_ = 0; + AbstractSemaphoreNotifyAction _tmp2_; GEnumValue* _tmp3_; #line 57 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp2_ = action; @@ -389,7 +389,7 @@ void abstract_semaphore_wait (AbstractSemaphore* self) { #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" while (TRUE) { #line 392 "Semaphore.c" - AbstractSemaphoreWaitAction _tmp0_ = 0; + AbstractSemaphoreWaitAction _tmp0_; #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp0_ = abstract_semaphore_do_wait (self); #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -429,7 +429,7 @@ AbstractSemaphoreWaitAction abstract_semaphore_do_wait (AbstractSemaphore* self) gboolean abstract_semaphore_reset (AbstractSemaphore* self) { gboolean result = FALSE; gboolean is_reset = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 79 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_val_if_fail (IS_ABSTRACT_SEMAPHORE (self), FALSE); #line 80 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -509,7 +509,7 @@ static gchar* value_abstract_semaphore_collect_value (GValue* value, guint n_col #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (collect_values[0].v_pointer) { #line 512 "Semaphore.c" - AbstractSemaphore* object; + AbstractSemaphore * object; object = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (object->parent_instance.g_class == NULL) { @@ -536,7 +536,7 @@ static gchar* value_abstract_semaphore_collect_value (GValue* value, guint n_col static gchar* value_abstract_semaphore_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - AbstractSemaphore** object_p; + AbstractSemaphore ** object_p; object_p = collect_values[0].v_pointer; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (!object_p) { @@ -588,7 +588,7 @@ gpointer value_get_abstract_semaphore (const GValue* value) { void value_set_abstract_semaphore (GValue* value, gpointer v_object) { - AbstractSemaphore* old; + AbstractSemaphore * old; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE)); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -619,7 +619,7 @@ void value_set_abstract_semaphore (GValue* value, gpointer v_object) { void value_take_abstract_semaphore (GValue* value, gpointer v_object) { - AbstractSemaphore* old; + AbstractSemaphore * old; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE)); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -655,11 +655,11 @@ static void abstract_semaphore_class_init (AbstractSemaphoreClass * klass) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_class_add_private (klass, sizeof (AbstractSemaphorePrivate)); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) abstract_semaphore_real_do_notify; + ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) abstract_semaphore_real_do_notify; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) abstract_semaphore_real_do_wait; + ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) abstract_semaphore_real_do_wait; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) abstract_semaphore_real_do_reset; + ((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*) (AbstractSemaphore *)) abstract_semaphore_real_do_reset; #line 664 "Semaphore.c" } @@ -677,7 +677,7 @@ static void abstract_semaphore_instance_init (AbstractSemaphore * self) { } -static void abstract_semaphore_finalize (AbstractSemaphore* obj) { +static void abstract_semaphore_finalize (AbstractSemaphore * obj) { AbstractSemaphore * self; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore); @@ -706,7 +706,7 @@ GType abstract_semaphore_get_type (void) { gpointer abstract_semaphore_ref (gpointer instance) { - AbstractSemaphore* self; + AbstractSemaphore * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_atomic_int_inc (&self->ref_count); @@ -717,7 +717,7 @@ gpointer abstract_semaphore_ref (gpointer instance) { void abstract_semaphore_unref (gpointer instance) { - AbstractSemaphore* self; + AbstractSemaphore * self; self = instance; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -750,7 +750,7 @@ Semaphore* semaphore_new (void) { static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore* base) { Semaphore * self; AbstractSemaphoreNotifyAction result = 0; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 101 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEMAPHORE, Semaphore); #line 102 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -777,7 +777,7 @@ static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* ba Semaphore * self; AbstractSemaphoreWaitAction result = 0; AbstractSemaphoreWaitAction _tmp0_ = 0; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 110 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEMAPHORE, Semaphore); #line 111 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -808,9 +808,9 @@ static void semaphore_class_init (SemaphoreClass * klass) { #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_class_add_private (klass, sizeof (SemaphorePrivate)); #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) semaphore_real_do_notify; + ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) semaphore_real_do_notify; #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) semaphore_real_do_wait; + ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) semaphore_real_do_wait; #line 815 "Semaphore.c" } @@ -824,7 +824,7 @@ static void semaphore_instance_init (Semaphore * self) { } -static void semaphore_finalize (AbstractSemaphore* obj) { +static void semaphore_finalize (AbstractSemaphore * obj) { Semaphore * self; #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEMAPHORE, Semaphore); @@ -848,7 +848,7 @@ GType semaphore_get_type (void) { CountdownSemaphore* countdown_semaphore_construct (GType object_type, gint total) { CountdownSemaphore* self = NULL; - gint _tmp0_ = 0; + gint _tmp0_; #line 120 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = (CountdownSemaphore*) abstract_semaphore_construct (object_type, ABSTRACT_SEMAPHORE_TYPE_BROADCAST); #line 122 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -871,12 +871,12 @@ CountdownSemaphore* countdown_semaphore_new (gint total) { static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (AbstractSemaphore* base) { CountdownSemaphore * self; AbstractSemaphoreNotifyAction result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; AbstractSemaphoreNotifyAction _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 125 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore); #line 126 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -886,8 +886,8 @@ static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (Abstrac #line 126 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" if (_tmp0_ >= _tmp1_) { #line 889 "Semaphore.c" - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gint _tmp2_; + gint _tmp3_; #line 127 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" _tmp2_ = self->priv->passed; #line 127 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -926,8 +926,8 @@ static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSem CountdownSemaphore * self; AbstractSemaphoreWaitAction result = 0; AbstractSemaphoreWaitAction _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp1_; + gint _tmp2_; #line 132 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore); #line 133 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -960,9 +960,9 @@ static void countdown_semaphore_class_init (CountdownSemaphoreClass * klass) { #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_class_add_private (klass, sizeof (CountdownSemaphorePrivate)); #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_notify; + ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) countdown_semaphore_real_do_notify; #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_wait; + ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) countdown_semaphore_real_do_wait; #line 967 "Semaphore.c" } @@ -976,7 +976,7 @@ static void countdown_semaphore_instance_init (CountdownSemaphore * self) { } -static void countdown_semaphore_finalize (AbstractSemaphore* obj) { +static void countdown_semaphore_finalize (AbstractSemaphore * obj) { CountdownSemaphore * self; #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore); @@ -1034,7 +1034,7 @@ static AbstractSemaphoreWaitAction event_semaphore_real_do_wait (AbstractSemapho EventSemaphore * self; AbstractSemaphoreWaitAction result = 0; AbstractSemaphoreWaitAction _tmp0_ = 0; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 150 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SEMAPHORE, EventSemaphore); #line 151 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" @@ -1080,11 +1080,11 @@ static void event_semaphore_class_init (EventSemaphoreClass * klass) { #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_class_add_private (klass, sizeof (EventSemaphorePrivate)); #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) event_semaphore_real_do_notify; + ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) event_semaphore_real_do_notify; #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) event_semaphore_real_do_wait; + ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) event_semaphore_real_do_wait; #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) event_semaphore_real_do_reset; + ((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*) (AbstractSemaphore *)) event_semaphore_real_do_reset; #line 1089 "Semaphore.c" } @@ -1098,7 +1098,7 @@ static void event_semaphore_instance_init (EventSemaphore * self) { } -static void event_semaphore_finalize (AbstractSemaphore* obj) { +static void event_semaphore_finalize (AbstractSemaphore * obj) { EventSemaphore * self; #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_SEMAPHORE, EventSemaphore); |