diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-01-03 13:59:36 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-01-03 13:59:36 +0100 |
commit | 9adade648eacc354cc6f4cf55f00e537a58d136f (patch) | |
tree | c4f919f7fda8250a3151b781707cf156260452b0 | |
parent | 29470dbcfc149d241886dcecb7fd6f4207dc7917 (diff) | |
download | vala-9adade648eacc354cc6f4cf55f00e537a58d136f.tar.gz |
codegen: Initialize "result" variable on declaration for abstract methods only
207 files changed, 428 insertions, 418 deletions
diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala index 9da195128..ff6d679ac 100644 --- a/codegen/valaccodemethodmodule.vala +++ b/codegen/valaccodemethodmodule.vala @@ -814,8 +814,13 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule { } if (current_method_return && !(m.return_type is VoidType) && !m.return_type.is_real_non_null_struct_type () && !m.coroutine) { - var vardecl = new CCodeVariableDeclarator ("result", default_value_for_type (m.return_type, true)); - vardecl.init0 = true; + CCodeVariableDeclarator vardecl; + if (m.is_abstract) { + vardecl = new CCodeVariableDeclarator ("result", default_value_for_type (m.return_type, true)); + vardecl.init0 = true; + } else { + vardecl = new CCodeVariableDeclarator ("result"); + } ccode.add_declaration (get_ccode_name (m.return_type), vardecl); } @@ -1120,8 +1125,13 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule { if (m.return_type.is_non_null_simple_type () && default_value_for_type (m.return_type, false) == null) { // the type check will use the result variable - var vardecl = new CCodeVariableDeclarator ("result", default_value_for_type (m.return_type, true)); - vardecl.init0 = true; + CCodeVariableDeclarator vardecl; + if (m.is_abstract) { + vardecl = new CCodeVariableDeclarator ("result", default_value_for_type (m.return_type, true)); + vardecl.init0 = true; + } else { + vardecl = new CCodeVariableDeclarator ("result"); + } ccode.add_declaration (get_ccode_name (m.return_type), vardecl); } diff --git a/tests/annotations/deprecated.c-expected b/tests/annotations/deprecated.c-expected index 729cd82e4..ceb54da63 100644 --- a/tests/annotations/deprecated.c-expected +++ b/tests/annotations/deprecated.c-expected @@ -222,7 +222,7 @@ fooclass_get_instance_private (FooClass* self) gint fooclass_foo (FooClass* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOOCLASS (self), 0); result = 42; return result; @@ -231,7 +231,7 @@ fooclass_foo (FooClass* self) static gint fooclass_real_foov (FooClass* self) { - gint result = 0; + gint result; result = 42; return result; } @@ -378,7 +378,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS gint afoo_foo (AFoo* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_AFOO (self), 0); result = 42; return result; @@ -450,7 +450,7 @@ afoo_get_type (void) gint ifoo_foo (IFoo* self) { - gint result = 0; + gint result; result = 42; return result; } diff --git a/tests/arrays/cast-struct-boxed-element-access.c-expected b/tests/arrays/cast-struct-boxed-element-access.c-expected index c9ab958f1..a7bff29a4 100644 --- a/tests/arrays/cast-struct-boxed-element-access.c-expected +++ b/tests/arrays/cast-struct-boxed-element-access.c-expected @@ -122,7 +122,7 @@ foo_array_owned (gint* result_length1) Foo** _tmp6_; Foo** _tmp7_; gint _tmp7__length1; - Foo** result = NULL; + Foo** result; memset (&_tmp0_, 0, sizeof (Foo)); _tmp0_.i = 23; _tmp1_ = _foo_dup0 (&_tmp0_); @@ -159,7 +159,7 @@ foo_array_unowned (gint* result_length1) gint _tmp7__length1; Foo** _tmp8_; gint _tmp8__length1; - Foo** result = NULL; + Foo** result; memset (&_tmp0_, 0, sizeof (Foo)); _tmp0_.i = 23; _tmp1_ = _foo_dup0 (&_tmp0_); @@ -431,7 +431,7 @@ bar_array_owned (gint* result_length1) gint _tmp13__length1; Bar** _tmp14_; gint _tmp14__length1; - Bar** result = NULL; + Bar** result; _tmp0_ = g_strdup ("foo"); memset (&_tmp1_, 0, sizeof (Bar)); _g_free0 (_tmp1_.s); @@ -488,7 +488,7 @@ bar_array_unowned (gint* result_length1) gint _tmp13__length1; Bar** _tmp14_; gint _tmp14__length1; - Bar** result = NULL; + Bar** result; _tmp0_ = g_strdup ("foo"); memset (&_tmp1_, 0, sizeof (Bar)); _g_free0 (_tmp1_.s); diff --git a/tests/arrays/empty-length-0.c-expected b/tests/arrays/empty-length-0.c-expected index e4337efa0..87791630b 100644 --- a/tests/arrays/empty-length-0.c-expected +++ b/tests/arrays/empty-length-0.c-expected @@ -152,7 +152,7 @@ get_foo (gint* result_length1) gint _tmp1__length1; gchar** _tmp2_; gint _tmp2__length1; - gchar** result = NULL; + gchar** result; _tmp0_ = foo; _tmp0__length1 = foo_length1; _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup1 (_tmp0_, _tmp0__length1) : _tmp0_; @@ -185,7 +185,7 @@ get_bar (gint* result_length1) gint _tmp1__length1; gint* _tmp2_; gint _tmp2__length1; - gint* result = NULL; + gint* result; _tmp0_ = bar; _tmp0__length1 = bar_length1; _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : _tmp0_; @@ -228,7 +228,7 @@ get_manam (gint* result_length1) gint _tmp1__length1; Manam* _tmp2_; gint _tmp2__length1; - Manam* result = NULL; + Manam* result; _tmp0_ = manam; _tmp0__length1 = manam_length1; _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : _tmp0_; diff --git a/tests/asynchronous/bug654337.c-expected b/tests/asynchronous/bug654337.c-expected index 925cba654..3237071f2 100644 --- a/tests/asynchronous/bug654337.c-expected +++ b/tests/asynchronous/bug654337.c-expected @@ -115,7 +115,7 @@ __lambda4_ (Block1Data* _data1_) GType t_type; GBoxedCopyFunc t_dup_func; GDestroyNotify t_destroy_func; - gboolean result = FALSE; + gboolean result; t_type = _data1_->t_type; t_dup_func = _data1_->t_dup_func; t_destroy_func = _data1_->t_destroy_func; diff --git a/tests/asynchronous/bug777242.c-expected b/tests/asynchronous/bug777242.c-expected index 8579446a8..1bfa9d031 100644 --- a/tests/asynchronous/bug777242.c-expected +++ b/tests/asynchronous/bug777242.c-expected @@ -130,7 +130,7 @@ block1_data_unref (void * _userdata_) static gboolean __lambda4_ (Block1Data* _data1_) { - gboolean result = FALSE; + gboolean result; run (NULL, NULL); g_main_loop_quit (_data1_->loop); result = FALSE; diff --git a/tests/asynchronous/generator.c-expected b/tests/asynchronous/generator.c-expected index 6ec0dbc79..910916b6d 100644 --- a/tests/asynchronous/generator.c-expected +++ b/tests/asynchronous/generator.c-expected @@ -392,7 +392,7 @@ generator_feed_co (GeneratorFeedData* _data_) gboolean generator_next (Generator* self) { - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (IS_GENERATOR (self), FALSE); result = !self->priv->consumed; return result; @@ -406,7 +406,7 @@ generator_get (Generator* self) gpointer _tmp1_; GSourceFunc _tmp2_; gpointer _tmp2__target; - gpointer result = NULL; + gpointer result; g_return_val_if_fail (IS_GENERATOR (self), NULL); _tmp0_ = self->priv->value; _tmp1_ = ((_tmp0_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp0_) : ((gpointer) _tmp0_); @@ -422,7 +422,7 @@ Generator* generator_iterator (Generator* self) { Generator* _tmp0_; - Generator* result = NULL; + Generator* result; g_return_val_if_fail (IS_GENERATOR (self), NULL); _tmp0_ = _generator_ref0 (self); result = _tmp0_; diff --git a/tests/basic-types/array-uint8-uchar-compat.c-expected b/tests/basic-types/array-uint8-uchar-compat.c-expected index 1321a5c30..17cf9aed7 100644 --- a/tests/basic-types/array-uint8-uchar-compat.c-expected +++ b/tests/basic-types/array-uint8-uchar-compat.c-expected @@ -36,7 +36,7 @@ get_buffer (void) { guchar* _tmp0_; gint _tmp0__length1; - guchar* result = NULL; + guchar* result; _tmp0_ = data; _tmp0__length1 = -1; result = _tmp0_; @@ -56,7 +56,7 @@ get_buffer2 (void) { guint8* _tmp0_; gint _tmp0__length1; - guint8* result = NULL; + guint8* result; _tmp0_ = data2; _tmp0__length1 = -1; result = _tmp0_; diff --git a/tests/basic-types/arrays-generics.c-expected b/tests/basic-types/arrays-generics.c-expected index 577faa096..348c30a16 100644 --- a/tests/basic-types/arrays-generics.c-expected +++ b/tests/basic-types/arrays-generics.c-expected @@ -122,7 +122,7 @@ static Baz* baz_get_object (Baz* self) { Baz* _tmp0_; - Baz* result = NULL; + Baz* result; g_return_val_if_fail (IS_BAZ (self), NULL); _tmp0_ = baz_new (); result = _tmp0_; @@ -175,7 +175,7 @@ baz_create_array (Baz* self, gint _tmp6__length1; Baz** _tmp7_; gint _tmp7__length1; - Baz** result = NULL; + Baz** result; g_return_val_if_fail (IS_BAZ (self), NULL); _tmp1_ = baz_get_array (self, TYPE_BAZ, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, &_tmp0_); a = _tmp1_; @@ -250,7 +250,7 @@ baz_create_array2 (Baz* self, gint _tmp6__length1; gpointer* _tmp7_; gint _tmp7__length1; - gpointer* result = NULL; + gpointer* result; g_return_val_if_fail (IS_BAZ (self), NULL); _tmp1_ = baz_get_array2 (self, v_type, (GBoxedCopyFunc) v_dup_func, (GDestroyNotify) v_destroy_func, &_tmp0_); a = _tmp1_; @@ -304,7 +304,7 @@ baz_get_array (Baz* self, Baz* _tmp1_; gpointer* _tmp2_; gint _tmp2__length1; - gpointer* result = NULL; + gpointer* result; g_return_val_if_fail (IS_BAZ (self), NULL); _tmp0_ = g_new0 (gpointer, 0); a = _tmp0_; @@ -364,7 +364,7 @@ baz_get_array2 (Baz* self, Baz* _tmp2_; gpointer* _tmp3_; gint _tmp3__length1; - gpointer* result = NULL; + gpointer* result; g_return_val_if_fail (IS_BAZ (self), NULL); _tmp0_ = g_new0 (gpointer, 0); a = _tmp0_; diff --git a/tests/basic-types/arrays.c-expected b/tests/basic-types/arrays.c-expected index ec9664488..36de500e9 100644 --- a/tests/basic-types/arrays.c-expected +++ b/tests/basic-types/arrays.c-expected @@ -709,7 +709,7 @@ pass_helper (gint* a, gint* _tmp1_; gint* _tmp2_; gint _tmp2__length1; - gint* result = NULL; + gint* result; _tmp0_ = (a != NULL) ? _vala_array_dup8 (a, a_length1) : a; _tmp0__length1 = a_length1; _vala_b = (g_free (_vala_b), NULL); @@ -954,7 +954,7 @@ nd_array_pass (gint* a, gint _tmp6__length1; gint _tmp6__length2; gint _tmp6__length3; - gint* result = NULL; + gint* result; _tmp0_ = a_length1; _vala_assert (_tmp0_ == 2, "a.length[0] == 2"); _tmp1_ = a_length2; @@ -1122,7 +1122,7 @@ test_nd_array (void) gint simple_func (void) { - gint result = 0; + gint result; result = 0; return result; } diff --git a/tests/basic-types/bug571486.c-expected b/tests/basic-types/bug571486.c-expected index c641e7aef..02368c6ef 100644 --- a/tests/basic-types/bug571486.c-expected +++ b/tests/basic-types/bug571486.c-expected @@ -126,7 +126,7 @@ foo_meth (Foo* self, gint _tmp2__length1; const gchar** _tmp3_; gint _tmp3__length1; - const gchar** result = NULL; + const gchar** result; g_return_val_if_fail (IS_FOO (self), NULL); _tmp0_ = (((const gchar**) var4) != NULL) ? _vala_array_dup1 ((const gchar**) var4, (var4_length1 * sizeof (const gchar*)) / sizeof (const gchar*)) : ((const gchar**) var4); _tmp0__length1 = (var4_length1 * sizeof (const gchar*)) / sizeof (const gchar*); diff --git a/tests/basic-types/bug650993.c-expected b/tests/basic-types/bug650993.c-expected index 94e09084e..52b5df15f 100644 --- a/tests/basic-types/bug650993.c-expected +++ b/tests/basic-types/bug650993.c-expected @@ -19,7 +19,7 @@ static void _vala_main (void); void* test (void) { - void* result = NULL; + void* result; result = NULL; return result; } diff --git a/tests/basic-types/bug686336.c-expected b/tests/basic-types/bug686336.c-expected index 32473b8bb..040fedcc8 100644 --- a/tests/basic-types/bug686336.c-expected +++ b/tests/basic-types/bug686336.c-expected @@ -103,7 +103,7 @@ foo_create_array (gint* result_length1) gint* _tmp0_; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; _tmp0_ = g_new0 (gint, 3); _tmp0_[0] = 1; _tmp0_[1] = 2; diff --git a/tests/basic-types/bug731017.c-expected b/tests/basic-types/bug731017.c-expected index 64b18d37c..5de4afa6f 100644 --- a/tests/basic-types/bug731017.c-expected +++ b/tests/basic-types/bug731017.c-expected @@ -45,7 +45,7 @@ bar (gint* result_length1) const gchar* _tmp1_; const gchar** _tmp2_; gint _tmp2__length1; - const gchar** result = NULL; + const gchar** result; _tmp0_ = g_new0 (const gchar*, 1 + 1); ret = _tmp0_; ret_length1 = 1; diff --git a/tests/basic-types/bug761736.c-expected b/tests/basic-types/bug761736.c-expected index 5a164dd6a..1a2ecb8b4 100644 --- a/tests/basic-types/bug761736.c-expected +++ b/tests/basic-types/bug761736.c-expected @@ -51,7 +51,7 @@ transfer_none (gint* result_length1) { gchar** _tmp0_; gint _tmp0__length1; - gchar** result = NULL; + gchar** result; _tmp0_ = FOO; _tmp0__length1 = G_N_ELEMENTS (FOO); if (result_length1) { @@ -78,7 +78,7 @@ transfer_container (gint* result_length1) gint _tmp0__length1; const gchar** _tmp1_; gint _tmp1__length1; - const gchar** result = NULL; + const gchar** result; _tmp0_ = _vala_array_dup1 (FOO, G_N_ELEMENTS (FOO)); _tmp0__length1 = G_N_ELEMENTS (FOO); _tmp1_ = _tmp0_; @@ -115,7 +115,7 @@ transfer_full (gint* result_length1) gint _tmp0__length1; gchar** _tmp1_; gint _tmp1__length1; - gchar** result = NULL; + gchar** result; _tmp0_ = _vala_array_dup2 (FOO, G_N_ELEMENTS (FOO)); _tmp0__length1 = G_N_ELEMENTS (FOO); _tmp1_ = _tmp0_; diff --git a/tests/basic-types/floats.c-expected b/tests/basic-types/floats.c-expected index 0950106ff..5d66d8939 100644 --- a/tests/basic-types/floats.c-expected +++ b/tests/basic-types/floats.c-expected @@ -43,7 +43,7 @@ double_to_string (gdouble self) const gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE); _tmp1_ = _tmp0_; _tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE; @@ -58,7 +58,7 @@ double_to_string (gdouble self) static gdouble double_parse (const gchar* str) { - gdouble result = 0.0; + gdouble result; g_return_val_if_fail (str != NULL, 0.0); result = g_ascii_strtod (str, NULL); return result; @@ -77,7 +77,7 @@ double_try_parse (const gchar* str, gchar* _tmp2_; gint _tmp3_; gint _tmp4_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (str != NULL, FALSE); errno = 0; _tmp1_ = g_ascii_strtod (str, &_tmp0_); @@ -214,7 +214,7 @@ test_double (void) static gfloat float_parse (const gchar* str) { - gfloat result = 0.0F; + gfloat result; g_return_val_if_fail (str != NULL, 0.0F); result = strtof (str, NULL); return result; @@ -233,7 +233,7 @@ float_try_parse (const gchar* str, gchar* _tmp2_; gint _tmp3_; gint _tmp4_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (str != NULL, FALSE); errno = 0; _tmp1_ = strtof (str, &_tmp0_); diff --git a/tests/basic-types/garray.c-expected b/tests/basic-types/garray.c-expected index 7a7b65693..729465303 100644 --- a/tests/basic-types/garray.c-expected +++ b/tests/basic-types/garray.c-expected @@ -227,7 +227,7 @@ vala_g_array_remove_index (GArray* self, gpointer* _tmp0_; gint _tmp0__length1; gpointer _tmp1_; - gpointer result = NULL; + gpointer result; g_return_val_if_fail (self != NULL, NULL); _vala_assert (self->len > index, "length > index"); _tmp0_ = self->data; @@ -248,7 +248,7 @@ vala_g_array_remove_index_fast (GArray* self, gpointer* _tmp0_; gint _tmp0__length1; gpointer _tmp1_; - gpointer result = NULL; + gpointer result; g_return_val_if_fail (self != NULL, NULL); _vala_assert (self->len > index, "length > index"); _tmp0_ = self->data; @@ -273,7 +273,7 @@ vala_g_array_remove_range (GArray* self, gint _ga_size_; gpointer* _tmp6_; gint _tmp6__length1; - gpointer* result = NULL; + gpointer* result; g_return_val_if_fail (self != NULL, NULL); _vala_assert (self->len >= (index + length), "this.length >= index + length"); _tmp0_ = g_new0 (gpointer, length); @@ -450,7 +450,7 @@ create_struct_garray (void) FooStruct _tmp10_; FooStruct _tmp11_; FooStruct* _tmp12_; - GArray* result = NULL; + GArray* result; _tmp0_ = g_array_new (TRUE, TRUE, sizeof (FooStruct*)); g_array_set_clear_func (_tmp0_, (GDestroyNotify) _vala_FooStruct_free_function_content_of); array = _tmp0_; @@ -572,7 +572,7 @@ test_object_garray (void) GArray* check_gvalue_garray (GArray* vals) { - GArray* result = NULL; + GArray* result; g_return_val_if_fail (vals != NULL, NULL); _vala_assert (g_strcmp0 (g_value_get_string (&g_array_index (vals, GValue, (guint) 0)), "foo") == 0, "vals.index (0) == \"foo\""); _vala_assert (g_value_get_int (&g_array_index (vals, GValue, (guint) 1)) == 42, "vals.index (1) == 42"); diff --git a/tests/basic-types/glists.c-expected b/tests/basic-types/glists.c-expected index 327abea09..4f3763c60 100644 --- a/tests/basic-types/glists.c-expected +++ b/tests/basic-types/glists.c-expected @@ -38,7 +38,7 @@ static void _vala_main (void); static inline gboolean vala_g_list_is_empty (GList* self) { - gboolean result = FALSE; + gboolean result; result = ((GList*) self) == NULL; return result; } @@ -97,7 +97,7 @@ test_glist (void) static inline gboolean vala_g_slist_is_empty (GSList* self) { - gboolean result = FALSE; + gboolean result; result = ((GSList*) self) == NULL; return result; } diff --git a/tests/basic-types/glists_remove.c-expected b/tests/basic-types/glists_remove.c-expected index da44d3ea3..48509c5f8 100644 --- a/tests/basic-types/glists_remove.c-expected +++ b/tests/basic-types/glists_remove.c-expected @@ -122,7 +122,7 @@ vala_g_list_remove_full (GList* self, GFreeFunc func) { GList* l = NULL; - GList* result = NULL; + GList* result; l = self; while (TRUE) { GList* _tmp0_; @@ -174,7 +174,7 @@ vala_g_list_remove_all_full (GList* self, GFreeFunc func) { GList* l = NULL; - GList* result = NULL; + GList* result; l = self; while (TRUE) { GList* _tmp0_; @@ -272,7 +272,7 @@ vala_g_slist_remove_full (GSList* self, GFreeFunc func) { GSList* l = NULL; - GSList* result = NULL; + GSList* result; l = self; while (TRUE) { GSList* _tmp0_; @@ -318,7 +318,7 @@ vala_g_slist_remove_all_full (GSList* self, GFreeFunc func) { GSList* l = NULL; - GSList* result = NULL; + GSList* result; l = self; while (TRUE) { GSList* _tmp0_; @@ -419,7 +419,7 @@ vala_g_queue_remove_full (GQueue* self, GList* _tmp0_; GList* _tmp1_; GList* _tmp2_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (self != NULL, FALSE); _tmp0_ = self->head; _tmp1_ = g_list_find (_tmp0_, data); @@ -456,7 +456,7 @@ vala_g_queue_remove_all_full (GQueue* self, guint old_length = 0U; GList* l = NULL; GList* _tmp0_; - guint result = 0U; + guint result; g_return_val_if_fail (self != NULL, 0U); old_length = self->length; _tmp0_ = self->head; diff --git a/tests/basic-types/gptrarray.c-expected b/tests/basic-types/gptrarray.c-expected index 031ff7c14..8f9b4d113 100644 --- a/tests/basic-types/gptrarray.c-expected +++ b/tests/basic-types/gptrarray.c-expected @@ -153,7 +153,7 @@ gint compare_foo (Foo* a, Foo* b) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (a), 0); g_return_val_if_fail (IS_FOO (b), 0); result = b->i - a->i; @@ -220,7 +220,7 @@ __lambda1_ (Block1Data* _data1_, gconstpointer** b) { GPtrArray* self; - gint result = 0; + gint result; self = _data1_->self; result = _data1_->compare_func ((gconstpointer**) (*a), (gconstpointer**) (*b)); return result; @@ -286,7 +286,7 @@ __lambda2_ (Block2Data* _data2_, gconstpointer** b) { GPtrArray* self; - gint result = 0; + gint result; self = _data2_->self; result = _data2_->compare_func ((gconstpointer**) (*a), (gconstpointer**) (*b), _data2_->compare_func_target); return result; diff --git a/tests/basic-types/integers.c-expected b/tests/basic-types/integers.c-expected index 7afe97c3c..cdad296a0 100644 --- a/tests/basic-types/integers.c-expected +++ b/tests/basic-types/integers.c-expected @@ -44,7 +44,7 @@ int_try_parse (const gchar* str, gint _tmp3_; gint _tmp4_; glong _tmp6_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (str != NULL, FALSE); errno = 0; _tmp1_ = strtol (str, &_tmp0_, (gint) _base); @@ -114,7 +114,7 @@ long_try_parse (const gchar* str, gchar* _tmp2_; gint _tmp3_; gint _tmp4_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (str != NULL, FALSE); errno = 0; _tmp1_ = strtol (str, &_tmp0_, (gint) _base); @@ -170,7 +170,7 @@ uint_try_parse (const gchar* str, gint _tmp3_; gint _tmp4_; gulong _tmp6_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (str != NULL, FALSE); errno = 0; _tmp1_ = strtoul (str, &_tmp0_, (gint) _base); @@ -240,7 +240,7 @@ ulong_try_parse (const gchar* str, gchar* _tmp2_; gint _tmp3_; gint _tmp4_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (str != NULL, FALSE); errno = 0; _tmp1_ = strtoul (str, &_tmp0_, (gint) _base); @@ -294,7 +294,7 @@ int64_try_parse (const gchar* str, gchar* _tmp2_; gint _tmp3_; gint _tmp4_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (str != NULL, FALSE); errno = 0; _tmp1_ = g_ascii_strtoll (str, &_tmp0_, _base); @@ -348,7 +348,7 @@ uint64_try_parse (const gchar* str, gchar* _tmp2_; gint _tmp3_; gint _tmp4_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (str != NULL, FALSE); errno = 0; _tmp1_ = g_ascii_strtoull (str, &_tmp0_, _base); diff --git a/tests/basic-types/pointers.c-expected b/tests/basic-types/pointers.c-expected index bd4314869..5bc716798 100644 --- a/tests/basic-types/pointers.c-expected +++ b/tests/basic-types/pointers.c-expected @@ -41,7 +41,7 @@ static const gint SIMPLE_STRUCT_array[1] = {42}; gint simple_struct_test (SimpleStruct *self) { - gint result = 0; + gint result; result = (*self).field; return result; } @@ -85,7 +85,7 @@ simple_struct_test_pointers_element_access (void) static gint* simple_struct_return_pointer (void) { - gint* result = NULL; + gint* result; result = SIMPLE_STRUCT_array; return result; } diff --git a/tests/basic-types/strings.c-expected b/tests/basic-types/strings.c-expected index 69f444356..1bea8da16 100644 --- a/tests/basic-types/strings.c-expected +++ b/tests/basic-types/strings.c-expected @@ -49,7 +49,7 @@ string_slice (const gchar* self, gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; gchar* _tmp4_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = strlen (self); _tmp1_ = _tmp0_; @@ -83,7 +83,7 @@ string_get (const gchar* self, glong index) { gchar _tmp0_; - gchar result = '\0'; + gchar result; g_return_val_if_fail (self != NULL, '\0'); _tmp0_ = ((gchar*) self)[index]; result = _tmp0_; @@ -258,7 +258,7 @@ _vala_g_strjoinv (const gchar* separator, gint str_array_length1) { gboolean _tmp0_ = FALSE; - gchar* result = NULL; + gchar* result; if (separator == NULL) { separator = ""; } @@ -475,7 +475,7 @@ string_replace (const gchar* self, gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError* _inner_error0_ = NULL; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (old != NULL, NULL); g_return_val_if_fail (replacement != NULL, NULL); @@ -635,7 +635,7 @@ string_splice (const gchar* self, gchar* _tmp9_; gchar* _tmp12_; const gchar* _tmp13_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = strlen (self); _tmp1_ = _tmp0_; @@ -768,7 +768,7 @@ string_strnlen (gchar* str, gchar* end = NULL; gchar* _tmp0_; gchar* _tmp1_; - glong result = 0L; + glong result; _tmp0_ = memchr (str, 0, (gsize) maxlen); end = _tmp0_; _tmp1_ = end; @@ -791,7 +791,7 @@ string_substring (const gchar* self, glong string_length = 0L; gboolean _tmp0_ = FALSE; gchar* _tmp3_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (self != NULL, NULL); if (offset >= ((glong) 0)) { _tmp0_ = len >= ((glong) 0); diff --git a/tests/bindings/gio/memoryoutputstream.c-expected b/tests/bindings/gio/memoryoutputstream.c-expected index 515949246..5c1131318 100644 --- a/tests/bindings/gio/memoryoutputstream.c-expected +++ b/tests/bindings/gio/memoryoutputstream.c-expected @@ -32,7 +32,7 @@ vala_g_memory_output_stream_with_data (guint8* data, gsize data_length1) { GMemoryOutputStream* _tmp0_; - GMemoryOutputStream* result = NULL; + GMemoryOutputStream* result; _tmp0_ = (GMemoryOutputStream*) g_memory_output_stream_new (data, (gsize) data_length1, NULL, NULL); result = _tmp0_; return result; @@ -134,7 +134,7 @@ vala_g_memory_output_stream_with_owned_data (guint8* data, GReallocFunc _tmp1_; GDestroyNotify _tmp2_; GMemoryOutputStream* _tmp3_; - GMemoryOutputStream* result = NULL; + GMemoryOutputStream* result; size = (gsize) data_length1; _tmp0_ = data; _tmp0__length1 = data_length1; diff --git a/tests/chainup/class-compact-base.c-expected b/tests/chainup/class-compact-base.c-expected index 1a39e4ae9..519b2e6b6 100644 --- a/tests/chainup/class-compact-base.c-expected +++ b/tests/chainup/class-compact-base.c-expected @@ -51,7 +51,7 @@ foo_new (void) gint foo_sum (Foo* self) { - gint result = 0; + gint result; g_return_val_if_fail (self != NULL, 0); result = self->a + self->b; return result; @@ -81,7 +81,7 @@ bar_new (void) gint bar_mul (Bar* self) { - gint result = 0; + gint result; g_return_val_if_fail (self != NULL, 0); result = ((Foo*) self)->a * ((Foo*) self)->b; return result; @@ -90,7 +90,7 @@ bar_mul (Bar* self) gint bar_mul2 (Bar* self) { - gint result = 0; + gint result; g_return_val_if_fail (self != NULL, 0); result = self->a * self->b; return result; diff --git a/tests/chainup/no-chainup.c-expected b/tests/chainup/no-chainup.c-expected index 9914158dc..b756a702e 100644 --- a/tests/chainup/no-chainup.c-expected +++ b/tests/chainup/no-chainup.c-expected @@ -109,7 +109,7 @@ foo_new (void) static gboolean __lambda4_ (Foo* self) { - gboolean result = FALSE; + gboolean result; result = TRUE; return result; } diff --git a/tests/chainup/struct-no-gtype-base.c-expected b/tests/chainup/struct-no-gtype-base.c-expected index 9257d6e5f..1926db780 100644 --- a/tests/chainup/struct-no-gtype-base.c-expected +++ b/tests/chainup/struct-no-gtype-base.c-expected @@ -38,7 +38,7 @@ static void _vala_main (void); gint foo_sum (Foo *self) { - gint result = 0; + gint result; result = (*self).a + (*self).b; return result; } @@ -61,7 +61,7 @@ foo_free (Foo* self) gint bar_mul (Bar *self) { - gint result = 0; + gint result; result = (*self).a * (*self).b; return result; } @@ -69,7 +69,7 @@ bar_mul (Bar *self) gint bar_mul2 (Bar *self) { - gint result = 0; + gint result; result = (*self).a * (*self).b; return result; } diff --git a/tests/chainup/struct-simple-no-gtype-base.c-expected b/tests/chainup/struct-simple-no-gtype-base.c-expected index 0e8923324..8ade7ae6e 100644 --- a/tests/chainup/struct-simple-no-gtype-base.c-expected +++ b/tests/chainup/struct-simple-no-gtype-base.c-expected @@ -33,7 +33,7 @@ gint foo_t_sum (foo_t self, foo_t b) { - gint result = 0; + gint result; result = (gint) (self + b); return result; } @@ -42,7 +42,7 @@ gint bar_t_mul (bar_t self, bar_t b) { - gint result = 0; + gint result; result = (gint) (self * b); return result; } @@ -51,7 +51,7 @@ gint bar_t_mul2 (bar_t self, bar_t b) { - gint result = 0; + gint result; result = (gint) (self * b); return result; } diff --git a/tests/control-flow/assigned-local-variable.c-expected b/tests/control-flow/assigned-local-variable.c-expected index 8920f8df8..ad1119fae 100644 --- a/tests/control-flow/assigned-local-variable.c-expected +++ b/tests/control-flow/assigned-local-variable.c-expected @@ -30,7 +30,7 @@ foo (gchar** s) { gchar* _vala_s = NULL; gchar* _tmp0_; - gboolean result = FALSE; + gboolean result; _tmp0_ = g_strdup ("foo"); _g_free0 (_vala_s); _vala_s = _tmp0_; @@ -46,7 +46,7 @@ foo (gchar** s) gint bar (void) { - gint result = 0; + gint result; result = 42; return result; } diff --git a/tests/control-flow/break.c-expected b/tests/control-flow/break.c-expected index 8ae8af4cf..12b91b613 100644 --- a/tests/control-flow/break.c-expected +++ b/tests/control-flow/break.c-expected @@ -55,7 +55,7 @@ maman_bar_main (void) FILE* _tmp0_; gint i = 0; FILE* _tmp4_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Break Test: 1"); { diff --git a/tests/control-flow/bug628336.c-expected b/tests/control-flow/bug628336.c-expected index 533e332a1..1e5fb82ce 100644 --- a/tests/control-flow/bug628336.c-expected +++ b/tests/control-flow/bug628336.c-expected @@ -51,7 +51,7 @@ static gboolean ____lambda4_ (Block1Data* _data1_) { const gchar* _tmp0_; - gboolean result = FALSE; + gboolean result; _tmp0_ = _data1_->bar; result = g_strcmp0 (_tmp0_, "bar") == 0; return result; diff --git a/tests/control-flow/bug639482.c-expected b/tests/control-flow/bug639482.c-expected index cec8fea53..d98351ebc 100644 --- a/tests/control-flow/bug639482.c-expected +++ b/tests/control-flow/bug639482.c-expected @@ -28,7 +28,7 @@ gchar* test (GError** error) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("foo"); result = _tmp0_; return result; diff --git a/tests/control-flow/bug691514.c-expected b/tests/control-flow/bug691514.c-expected index baa9426df..a9d9a29b1 100644 --- a/tests/control-flow/bug691514.c-expected +++ b/tests/control-flow/bug691514.c-expected @@ -39,7 +39,7 @@ test (gint* result_length1, gchar** _tmp1_; gchar** _tmp2_; gint _tmp2__length1; - gchar** result = NULL; + gchar** result; _tmp0_ = g_strdup ("1"); _tmp1_ = g_new0 (gchar*, 2 + 1); _tmp1_[0] = NULL; diff --git a/tests/control-flow/bug736774-1.c-expected b/tests/control-flow/bug736774-1.c-expected index a84ab1ec1..f0bb4f41d 100644 --- a/tests/control-flow/bug736774-1.c-expected +++ b/tests/control-flow/bug736774-1.c-expected @@ -122,7 +122,7 @@ Foo* may_fail (GError** error) { Foo* _tmp0_; - Foo* result = NULL; + Foo* result; _tmp0_ = foo_new (); result = _tmp0_; return result; diff --git a/tests/control-flow/bug736774-2.c-expected b/tests/control-flow/bug736774-2.c-expected index 47d895124..b9567e16d 100644 --- a/tests/control-flow/bug736774-2.c-expected +++ b/tests/control-flow/bug736774-2.c-expected @@ -54,7 +54,7 @@ may_fail (GError** error) vstring* _result_ = NULL; gchar* _tmp0_; vstring* _tmp1_; - vstring* result = NULL; + vstring* result; _tmp0_ = g_strdup ("test"); _result_ = (vstring*) _tmp0_; _tmp1_ = _result_; diff --git a/tests/control-flow/bug761267-1.c-expected b/tests/control-flow/bug761267-1.c-expected index 21e8db20b..2bb072f2a 100644 --- a/tests/control-flow/bug761267-1.c-expected +++ b/tests/control-flow/bug761267-1.c-expected @@ -80,7 +80,7 @@ static void _vala_main (void); Foo* foo_foo (Foo* self) { - Foo* result = NULL; + Foo* result; g_return_val_if_fail (IS_FOO (self), NULL); result = NULL; return result; diff --git a/tests/control-flow/bug761267-2.c-expected b/tests/control-flow/bug761267-2.c-expected index 804e6a91d..c3727b922 100644 --- a/tests/control-flow/bug761267-2.c-expected +++ b/tests/control-flow/bug761267-2.c-expected @@ -147,7 +147,7 @@ foo_get_instance_private (Foo* self) gint foo_foo (Foo* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); result = self->i; return result; @@ -157,7 +157,7 @@ Bar* foo_bar (Foo* self) { Bar* _tmp0_; - Bar* result = NULL; + Bar* result; g_return_val_if_fail (IS_FOO (self), NULL); _tmp0_ = bar_new (); result = _tmp0_; @@ -175,7 +175,7 @@ foo_bars (Foo* self, gint _a_size_; Bar** _tmp5_; gint _tmp5__length1; - Bar** result = NULL; + Bar** result; g_return_val_if_fail (IS_FOO (self), NULL); _tmp0_ = g_new0 (Bar*, n + 1); a = _tmp0_; @@ -229,7 +229,7 @@ foo_seq (Foo* self, gint _a_size_; gint* _tmp4_; gint _tmp4__length1; - gint* result = NULL; + gint* result; g_return_val_if_fail (IS_FOO (self), NULL); _tmp0_ = g_new0 (gint, n); a = _tmp0_; diff --git a/tests/control-flow/coalesce-as-argument.c-expected b/tests/control-flow/coalesce-as-argument.c-expected index fe4772f78..2ca2a881f 100644 --- a/tests/control-flow/coalesce-as-argument.c-expected +++ b/tests/control-flow/coalesce-as-argument.c-expected @@ -36,7 +36,7 @@ gchar* get_bar (void) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("bar"); result = _tmp0_; return result; diff --git a/tests/control-flow/coalesce-execution-order.c-expected b/tests/control-flow/coalesce-execution-order.c-expected index a2e52dae8..efaf3e11e 100644 --- a/tests/control-flow/coalesce-execution-order.c-expected +++ b/tests/control-flow/coalesce-execution-order.c-expected @@ -31,7 +31,7 @@ static void _vala_main (void); gchar* get_foo (void) { - gchar* result = NULL; + gchar* result; _vala_assert (count == 0, "count == 0"); result = NULL; return result; @@ -42,7 +42,7 @@ get_bar (void) { gint _tmp0_; gchar* _tmp1_; - gchar* result = NULL; + gchar* result; _tmp0_ = count; count = _tmp0_ + 1; _vala_assert (count == 1, "count == 1"); diff --git a/tests/control-flow/coalesce-reference-transfer.c-expected b/tests/control-flow/coalesce-reference-transfer.c-expected index 9bbb1de6b..9a27fcba1 100644 --- a/tests/control-flow/coalesce-reference-transfer.c-expected +++ b/tests/control-flow/coalesce-reference-transfer.c-expected @@ -56,7 +56,7 @@ Foo* get_foo (gint* i) { Foo* _tmp0_ = NULL; - Foo* result = NULL; + Foo* result; if (i != NULL) { Foo* _tmp1_; _tmp1_ = foo_new (*i); diff --git a/tests/control-flow/conditional-as-argument.c-expected b/tests/control-flow/conditional-as-argument.c-expected index 15fa908ff..880af4204 100644 --- a/tests/control-flow/conditional-as-argument.c-expected +++ b/tests/control-flow/conditional-as-argument.c-expected @@ -36,7 +36,7 @@ gchar* get_bar (void) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("bar"); result = _tmp0_; return result; diff --git a/tests/control-flow/expressions-conditional.c-expected b/tests/control-flow/expressions-conditional.c-expected index 9ef5cfa08..2e3b5bf48 100644 --- a/tests/control-flow/expressions-conditional.c-expected +++ b/tests/control-flow/expressions-conditional.c-expected @@ -58,7 +58,7 @@ maman_bar_get_number (void) { const gchar* _tmp0_ = NULL; gchar* _tmp1_; - gchar* result = NULL; + gchar* result; if (FALSE) { _tmp0_ = "BAD"; } else { @@ -80,7 +80,7 @@ maman_bar_main (void) gchar* _tmp5_; gchar* _tmp6_; FILE* _tmp7_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Conditional Expression Test: 1"); if (FALSE) { diff --git a/tests/control-flow/sideeffects.c-expected b/tests/control-flow/sideeffects.c-expected index ccd72290c..0479213c8 100644 --- a/tests/control-flow/sideeffects.c-expected +++ b/tests/control-flow/sideeffects.c-expected @@ -64,7 +64,7 @@ Foo* foo_sideeffect (Foo* self) { gint _tmp0_; - Foo* result = NULL; + Foo* result; g_return_val_if_fail (IS_FOO (self), NULL); self->i = self->i - 1; _tmp0_ = self->i; diff --git a/tests/control-flow/switch-enum.c-expected b/tests/control-flow/switch-enum.c-expected index ad6c98fc3..42c32764a 100644 --- a/tests/control-flow/switch-enum.c-expected +++ b/tests/control-flow/switch-enum.c-expected @@ -55,7 +55,7 @@ Foo foo (void) { Foo foo = 0; - Foo result = 0; + Foo result; foo = FOO_BAR; switch (foo) { case FOO_FOO: diff --git a/tests/control-flow/switch-string.c-expected b/tests/control-flow/switch-string.c-expected index dea8a5d73..c8d66e6ff 100644 --- a/tests/control-flow/switch-string.c-expected +++ b/tests/control-flow/switch-string.c-expected @@ -40,7 +40,7 @@ foo (void) static GQuark _tmp2_label1 = 0; static GQuark _tmp2_label2 = 0; static GQuark _tmp2_label3 = 0; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("foo"); foo = _tmp0_; _tmp1_ = foo; @@ -75,7 +75,7 @@ gchar* get_bar (void) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("bar"); result = _tmp0_; return result; @@ -91,7 +91,7 @@ bar (void) static GQuark _tmp2_label1 = 0; static GQuark _tmp2_label2 = 0; gchar* _tmp4_; - gchar* result = NULL; + gchar* result; _tmp0_ = get_bar (); _tmp1_ = _tmp0_; _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); diff --git a/tests/control-flow/switch.c-expected b/tests/control-flow/switch.c-expected index 97add93dd..1d35aad73 100644 --- a/tests/control-flow/switch.c-expected +++ b/tests/control-flow/switch.c-expected @@ -94,7 +94,7 @@ static gboolean maman_bar_test_switch_control_flow_graph (void) { gint a = 0; - gboolean result = FALSE; + gboolean result; a = 0; switch (a) { case 1: @@ -120,7 +120,7 @@ maman_bar_main (void) MamanFoo* foo = NULL; MamanFoo* _tmp6_; FILE* _tmp7_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "For Test: 1"); { @@ -296,7 +296,7 @@ gint maman_foo_inc (MamanFoo* self) { gint _tmp0_; - gint result = 0; + gint result; g_return_val_if_fail (MAMAN_IS_FOO (self), 0); _tmp0_ = self->priv->counter; self->priv->counter = _tmp0_ + 1; diff --git a/tests/dbus/arrays_server.c-expected b/tests/dbus/arrays_server.c-expected index 7cae17ed0..f704996c4 100644 --- a/tests/dbus/arrays_server.c-expected +++ b/tests/dbus/arrays_server.c-expected @@ -187,7 +187,7 @@ test_test_int (Test* self, gint* _tmp3_; gint* _tmp4_; gint _tmp4__length1; - gint* result = NULL; + gint* result; g_return_val_if_fail (IS_TEST (self), NULL); if (i_length1 == 1) { gint _tmp1_; @@ -238,7 +238,7 @@ test_test_string (Test* self, gchar** _tmp5_; gchar** _tmp6_; gint _tmp6__length1; - gchar** result = NULL; + gchar** result; g_return_val_if_fail (IS_TEST (self), NULL); if (s_length1 == 1) { const gchar* _tmp1_; diff --git a/tests/dbus/async-bus_server.c-expected b/tests/dbus/async-bus_server.c-expected index 014c26f94..b0e4b2f16 100644 --- a/tests/dbus/async-bus_server.c-expected +++ b/tests/dbus/async-bus_server.c-expected @@ -119,7 +119,7 @@ gint test_get_test (Test* self, GError** error) { - gint result = 0; + gint result; g_return_val_if_fail (IS_TEST (self), 0); result = 4711; return result; diff --git a/tests/dbus/async-connection_server.c-expected b/tests/dbus/async-connection_server.c-expected index c1c589bb3..1dd1ad676 100644 --- a/tests/dbus/async-connection_server.c-expected +++ b/tests/dbus/async-connection_server.c-expected @@ -119,7 +119,7 @@ gint test_get_test (Test* self, GError** error) { - gint result = 0; + gint result; g_return_val_if_fail (IS_TEST (self), 0); result = 4711; return result; diff --git a/tests/dbus/async-no-reply_client.c-expected b/tests/dbus/async-no-reply_client.c-expected index 2077f8780..2970fe51c 100644 --- a/tests/dbus/async-no-reply_client.c-expected +++ b/tests/dbus/async-no-reply_client.c-expected @@ -753,7 +753,7 @@ __lambda4_ (Block1Data* _data1_, gboolean _tmp0_ = FALSE; const gchar* _tmp1_; GDBusMessage* _tmp6_; - GDBusMessage* result = NULL; + GDBusMessage* result; g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (conn, g_dbus_connection_get_type ()), NULL); g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (message, g_dbus_message_get_type ()), NULL); _tmp1_ = g_dbus_message_get_interface (message); diff --git a/tests/dbus/basic-types_server.c-expected b/tests/dbus/basic-types_server.c-expected index 4049ef6b3..ad21fcde7 100644 --- a/tests/dbus/basic-types_server.c-expected +++ b/tests/dbus/basic-types_server.c-expected @@ -187,7 +187,7 @@ test_test_int (Test* self, gint* j) { gint _vala_j = 0; - gint result = 0; + gint result; g_return_val_if_fail (IS_TEST (self), 0); _vala_assert (i == 42, "i == 42"); _vala_j = 23; @@ -206,7 +206,7 @@ test_test_string (Test* self, gchar* _vala_t = NULL; gchar* _tmp0_; gchar* _tmp1_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (IS_TEST (self), NULL); g_return_val_if_fail (s != NULL, NULL); _vala_assert (g_strcmp0 (s, "hello") == 0, "s == \"hello\""); diff --git a/tests/dbus/bug602003_server.c-expected b/tests/dbus/bug602003_server.c-expected index d3801ff78..b4e2361f7 100644 --- a/tests/dbus/bug602003_server.c-expected +++ b/tests/dbus/bug602003_server.c-expected @@ -144,7 +144,7 @@ test_test_string (Test* self) gint _tmp2__length1; GVariant* _tmp6_; GVariant* _tmp7_; - GVariant* result = NULL; + GVariant* result; g_return_val_if_fail (IS_TEST (self), NULL); _tmp0_ = g_strdup ("hello"); _tmp1_ = g_new0 (gchar*, 1 + 1); diff --git a/tests/dbus/bug735437_server.c-expected b/tests/dbus/bug735437_server.c-expected index 536be463a..6d6a4c792 100644 --- a/tests/dbus/bug735437_server.c-expected +++ b/tests/dbus/bug735437_server.c-expected @@ -145,7 +145,7 @@ test_array (Test* self, gdouble* _tmp0_; gdouble* _tmp1_; gint _tmp1__length1; - gdouble* result = NULL; + gdouble* result; g_return_val_if_fail (IS_TEST (self), NULL); _tmp0_ = g_new0 (gdouble, 2); _tmp0_[0] = 2.0; @@ -168,7 +168,7 @@ test_multi_array (Test* self, gdouble* _tmp1_; gint _tmp1__length1; gint _tmp1__length2; - gdouble* result = NULL; + gdouble* result; g_return_val_if_fail (IS_TEST (self), NULL); _tmp0_ = g_new0 (gdouble, 2 * 2); _tmp0_[0] = 2.0; @@ -207,7 +207,7 @@ test_multi_array2 (Test* self, gint _tmp9__length1; gint _tmp9__length2; gint _tmp9__length3; - gchar** result = NULL; + gchar** result; g_return_val_if_fail (IS_TEST (self), NULL); _tmp0_ = g_strdup ("foo"); _tmp1_ = g_strdup ("bar"); diff --git a/tests/dbus/bug782719_server.c-expected b/tests/dbus/bug782719_server.c-expected index 1022c606e..c83c0e629 100644 --- a/tests/dbus/bug782719_server.c-expected +++ b/tests/dbus/bug782719_server.c-expected @@ -178,7 +178,7 @@ test_test_nested_dict (Test* self) GHashTable* _tmp10_; gchar* _tmp11_; GHashTable* _tmp12_; - GHashTable* result = NULL; + GHashTable* result; g_return_val_if_fail (IS_TEST (self), NULL); _tmp0_ = g_strdup ("hello"); _tmp1_ = g_new0 (gchar*, 1 + 1); diff --git a/tests/dbus/bug783002_server.c-expected b/tests/dbus/bug783002_server.c-expected index 373027c43..82fd4d43f 100644 --- a/tests/dbus/bug783002_server.c-expected +++ b/tests/dbus/bug783002_server.c-expected @@ -251,7 +251,7 @@ static gboolean __lambda4_ (Block1Data* _data1_) { Test* self; - gboolean result = FALSE; + gboolean result; self = _data1_->self; test_test_array_lifetime_co (_data1_->_async_data_); result = FALSE; diff --git a/tests/dbus/connection_server.c-expected b/tests/dbus/connection_server.c-expected index ab9db7747..1f44babeb 100644 --- a/tests/dbus/connection_server.c-expected +++ b/tests/dbus/connection_server.c-expected @@ -119,7 +119,7 @@ gint test_get_test (Test* self, GError** error) { - gint result = 0; + gint result; g_return_val_if_fail (IS_TEST (self), 0); result = 4711; return result; diff --git a/tests/dbus/dicts_server.c-expected b/tests/dbus/dicts_server.c-expected index 5787f45d7..5ca0c7f46 100644 --- a/tests/dbus/dicts_server.c-expected +++ b/tests/dbus/dicts_server.c-expected @@ -263,7 +263,7 @@ test_test_dict (Test* self) GHashTable* _tmp3_; gchar* _tmp4_; GVariant* _tmp8_; - GHashTable* result = NULL; + GHashTable* result; g_return_val_if_fail (IS_TEST (self), NULL); _tmp0_ = g_strdup ("hello"); _tmp1_ = g_new0 (gchar*, 1 + 1); @@ -701,7 +701,7 @@ test_interface_foo_real_foo (TestInterfaceBar* base, GHashFunc _tmp0_; GEqualFunc _tmp1_; GHashTable* _tmp2_; - GHashTable* result = NULL; + GHashTable* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TEST_INTERFACE_TYPE_FOO, TestInterfaceFoo); _tmp0_ = g_str_hash; _tmp1_ = g_str_equal; diff --git a/tests/dbus/dynamic-method_server.c-expected b/tests/dbus/dynamic-method_server.c-expected index ad30a41eb..3829a0e96 100644 --- a/tests/dbus/dynamic-method_server.c-expected +++ b/tests/dbus/dynamic-method_server.c-expected @@ -128,7 +128,7 @@ test_do_foo (Test* self, { gchar* _vala_s = NULL; gchar* _tmp0_; - gint result = 0; + gint result; g_return_val_if_fail (IS_TEST (self), 0); _vala_assert (i == 42, "i == 42"); _tmp0_ = g_strdup ("foo"); diff --git a/tests/dbus/filedescriptor_server.c-expected b/tests/dbus/filedescriptor_server.c-expected index 25bd10991..e1af703bd 100644 --- a/tests/dbus/filedescriptor_server.c-expected +++ b/tests/dbus/filedescriptor_server.c-expected @@ -168,7 +168,7 @@ test_test_in (Test* self, gint _tmp19_; GUnixInputStream* _tmp20_; GError* _inner_error0_ = NULL; - GUnixInputStream* result = NULL; + GUnixInputStream* result; g_return_val_if_fail (IS_TEST (self), NULL); g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (i, G_TYPE_UNIX_INPUT_STREAM), NULL); _tmp0_ = g_new0 (guint8, 1); diff --git a/tests/dbus/generics_client.c-expected b/tests/dbus/generics_client.c-expected index 71b18d563..9b9fa702f 100644 --- a/tests/dbus/generics_client.c-expected +++ b/tests/dbus/generics_client.c-expected @@ -333,7 +333,7 @@ call (GType t_type, gpointer _tmp1_; gpointer _tmp2_; GError* _inner_error0_ = NULL; - gpointer result = NULL; + gpointer result; g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (conn, g_dbus_connection_get_type ()), NULL); g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (object_path != NULL, NULL); diff --git a/tests/dbus/generics_server.c-expected b/tests/dbus/generics_server.c-expected index a69750d2c..69ad1af4f 100644 --- a/tests/dbus/generics_server.c-expected +++ b/tests/dbus/generics_server.c-expected @@ -130,7 +130,7 @@ gint test_get_test (Test* self, GError** error) { - gint result = 0; + gint result; g_return_val_if_fail (IS_TEST (self), 0); result = 23; return result; diff --git a/tests/dbus/no-reply_client.c-expected b/tests/dbus/no-reply_client.c-expected index ea44e8ea4..ffeb1f52b 100644 --- a/tests/dbus/no-reply_client.c-expected +++ b/tests/dbus/no-reply_client.c-expected @@ -681,7 +681,7 @@ __lambda4_ (Block1Data* _data1_, gboolean _tmp0_ = FALSE; const gchar* _tmp1_; GDBusMessage* _tmp6_; - GDBusMessage* result = NULL; + GDBusMessage* result; g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (conn, g_dbus_connection_get_type ()), NULL); g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (message, g_dbus_message_get_type ()), NULL); _tmp1_ = g_dbus_message_get_interface (message); diff --git a/tests/dbus/no-reply_server.c-expected b/tests/dbus/no-reply_server.c-expected index 1d719cde6..f582dc193 100644 --- a/tests/dbus/no-reply_server.c-expected +++ b/tests/dbus/no-reply_server.c-expected @@ -186,7 +186,7 @@ test_list_messages (Test* self, gint _tmp1__length1; gchar** _tmp2_; gint _tmp2__length1; - gchar** result = NULL; + gchar** result; g_return_val_if_fail (IS_TEST (self), NULL); _tmp0_ = self->priv->messages; _tmp0__length1 = self->priv->messages_length1; diff --git a/tests/dbus/rawvariants_server.c-expected b/tests/dbus/rawvariants_server.c-expected index f1e88b5cf..10c8c023c 100644 --- a/tests/dbus/rawvariants_server.c-expected +++ b/tests/dbus/rawvariants_server.c-expected @@ -276,7 +276,7 @@ test_test_method (Test* self, gint j, gint k) { - gint result = 0; + gint result; g_return_val_if_fail (IS_TEST (self), 0); _vala_assert (j == 23, "j == 23"); _vala_assert (k == 11, "k == 11"); @@ -620,7 +620,7 @@ test_raw_test_method (TestRaw* self, gint _tmp1_; GVariant* _tmp2_; GVariant* _tmp3_; - GVariant* result = NULL; + GVariant* result; g_return_val_if_fail (IS_TEST_RAW (self), NULL); g_return_val_if_fail (j != NULL, NULL); g_return_val_if_fail (k != NULL, NULL); diff --git a/tests/delegates/bug638415.c-expected b/tests/delegates/bug638415.c-expected index 772da589f..367a2cc95 100644 --- a/tests/delegates/bug638415.c-expected +++ b/tests/delegates/bug638415.c-expected @@ -33,7 +33,7 @@ foo (gint* result_length1) gchar** _tmp0_; gchar** _tmp1_; gint _tmp1__length1; - gchar** result = NULL; + gchar** result; _tmp0_ = g_new0 (gchar*, 0 + 1); _tmp1_ = _tmp0_; _tmp1__length1 = 0; diff --git a/tests/delegates/bug639751.c-expected b/tests/delegates/bug639751.c-expected index 35f39994b..af1fae477 100644 --- a/tests/delegates/bug639751.c-expected +++ b/tests/delegates/bug639751.c-expected @@ -93,7 +93,7 @@ block1_data_unref (void * _userdata_) static gboolean __lambda4_ (Block1Data* _data1_) { - gboolean result = FALSE; + gboolean result; _data1_->foo.bar = NULL; _data1_->foo.bar_target = NULL; result = FALSE; diff --git a/tests/delegates/bug659778.c-expected b/tests/delegates/bug659778.c-expected index f42c329c4..594ab4389 100644 --- a/tests/delegates/bug659778.c-expected +++ b/tests/delegates/bug659778.c-expected @@ -120,7 +120,7 @@ static TestEnum __lambda4_ (TestEnum self, TestEnum x) { - TestEnum result = 0; + TestEnum result; switch (self) { case TEST_ENUM_T: { @@ -173,7 +173,7 @@ __lambda5_ (Block1Data* _data1_, TestEnum x) { TestEnum self; - TestEnum result = 0; + TestEnum result; self = _data1_->self; switch (self) { case TEST_ENUM_T: @@ -265,7 +265,7 @@ static TestEnum test_g (TestEnum i, Test* self) { - TestEnum result = 0; + TestEnum result; g_return_val_if_fail (IS_TEST (self), 0); result = i; return result; @@ -275,7 +275,7 @@ static gint test_h (gint i, Test* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_TEST (self), 0); result = i; return result; @@ -500,7 +500,7 @@ _vala_main (void) TestEnum t = 0; Test* t2 = NULL; Test* _tmp0_; - gint result = 0; + gint result; t = TEST_ENUM_T; test_enum_f (t); test_enum_g (t, 0); diff --git a/tests/delegates/bug761360.c-expected b/tests/delegates/bug761360.c-expected index 9e9379d13..f180a86d7 100644 --- a/tests/delegates/bug761360.c-expected +++ b/tests/delegates/bug761360.c-expected @@ -20,7 +20,7 @@ __lambda4_ (gint* result_length1) gint* _tmp0_; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; _tmp0_ = g_new0 (gint, 3); _tmp0_[0] = 1; _tmp0_[1] = 2; diff --git a/tests/delegates/bug792077.c-expected b/tests/delegates/bug792077.c-expected index 159d75351..5abd863a4 100644 --- a/tests/delegates/bug792077.c-expected +++ b/tests/delegates/bug792077.c-expected @@ -53,7 +53,7 @@ __lambda4_ (gpointer* result_target, FooFunc _tmp0_; gpointer _tmp0__target; GDestroyNotify _tmp0__target_destroy_notify; - FooFunc result = NULL; + FooFunc result; _tmp0_ = ___lambda5__foo_func; _tmp0__target = NULL; _tmp0__target_destroy_notify = NULL; diff --git a/tests/delegates/delegates.c-expected b/tests/delegates/delegates.c-expected index ae52846d0..849fe3148 100644 --- a/tests/delegates/delegates.c-expected +++ b/tests/delegates/delegates.c-expected @@ -265,7 +265,7 @@ maman_bar_do_void_action (void) static gint maman_bar_do_action (void) { - gint result = 0; + gint result; result = 4; return result; } @@ -434,7 +434,7 @@ ___lambda4__maman_void_callback (void) static MamanVoidCallback maman_bar_test_unowned_delegate_return (void) { - MamanVoidCallback result = NULL; + MamanVoidCallback result; result = ___lambda4__maman_void_callback; return result; } @@ -478,7 +478,7 @@ maman_bar_main (void) FILE* _tmp10_; MamanVoidCallback baz = NULL; MamanVoidCallback _tmp11_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Delegate Test: 1"); void_cb = _maman_bar_do_void_action_maman_void_callback; diff --git a/tests/delegates/error-pos.c-expected b/tests/delegates/error-pos.c-expected index cc87fa625..8023b65fc 100644 --- a/tests/delegates/error-pos.c-expected +++ b/tests/delegates/error-pos.c-expected @@ -103,7 +103,7 @@ bar_foo (Bar* self, gint i) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (IS_BAR (self), NULL); _vala_assert (IS_BAR (self), "this is Bar"); _tmp0_ = g_strdup_printf ("%i", i); diff --git a/tests/delegates/gclosure-conversion.c-expected b/tests/delegates/gclosure-conversion.c-expected index f7b889293..73612283d 100644 --- a/tests/delegates/gclosure-conversion.c-expected +++ b/tests/delegates/gclosure-conversion.c-expected @@ -395,7 +395,7 @@ to_int (GBinding* b, GValue* to) { const gchar* _tmp0_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (b, G_TYPE_BINDING), FALSE); g_return_val_if_fail (from != NULL, FALSE); g_return_val_if_fail (to != NULL, FALSE); @@ -412,7 +412,7 @@ to_string (GBinding* b, { gchar* _tmp0_; gchar* _tmp1_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (b, G_TYPE_BINDING), FALSE); g_return_val_if_fail (from != NULL, FALSE); g_return_val_if_fail (to != NULL, FALSE); diff --git a/tests/delegates/implicit-local-variable.c-expected b/tests/delegates/implicit-local-variable.c-expected index f38ba1dca..489221096 100644 --- a/tests/delegates/implicit-local-variable.c-expected +++ b/tests/delegates/implicit-local-variable.c-expected @@ -15,7 +15,7 @@ static gboolean ___lambda4__gsource_dispatch_func (GSource* source, static gboolean __lambda4_ (void) { - gboolean result = FALSE; + gboolean result; result = FALSE; return result; } diff --git a/tests/delegates/lambda-mixed-instance-static.c-expected b/tests/delegates/lambda-mixed-instance-static.c-expected index 5f79ce8a4..1beb45a96 100644 --- a/tests/delegates/lambda-mixed-instance-static.c-expected +++ b/tests/delegates/lambda-mixed-instance-static.c-expected @@ -68,7 +68,7 @@ block1_data_unref (void * _userdata_) static gint __lambda4_ (gint i) { - gint result = 0; + gint result; _vala_assert (i == 42, "i == 42"); result = i; return result; @@ -86,7 +86,7 @@ static gint __lambda5_ (Block1Data* _data1_, gint i) { - gint result = 0; + gint result; _vala_assert (i == 23, "i == 23"); result = _data1_->global; return result; diff --git a/tests/delegates/member-target-destroy.c-expected b/tests/delegates/member-target-destroy.c-expected index 85d2ab3f4..0fd0ff714 100644 --- a/tests/delegates/member-target-destroy.c-expected +++ b/tests/delegates/member-target-destroy.c-expected @@ -30,7 +30,7 @@ gchar* bar (const gchar* s) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (s != NULL, NULL); _tmp0_ = g_strdup (s); result = _tmp0_; diff --git a/tests/delegates/return-array-null-terminated.c-expected b/tests/delegates/return-array-null-terminated.c-expected index e519e2f10..4a89bb8f9 100644 --- a/tests/delegates/return-array-null-terminated.c-expected +++ b/tests/delegates/return-array-null-terminated.c-expected @@ -38,7 +38,7 @@ foo (void) gchar* _tmp0_; gchar* _tmp1_; gchar** _tmp2_; - gchar** result = NULL; + gchar** result; _tmp0_ = g_strdup ("foo"); _tmp1_ = g_strdup ("bar"); _tmp2_ = g_new0 (gchar*, 2 + 1); diff --git a/tests/enums/bug614424.c-expected b/tests/enums/bug614424.c-expected index d769d657d..76c94dca9 100644 --- a/tests/enums/bug614424.c-expected +++ b/tests/enums/bug614424.c-expected @@ -36,7 +36,7 @@ foo_bar (Foo self) { GEnumValue* _tmp0_; gchar* _tmp1_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_enum_get_value (g_type_class_ref (TYPE_FOO), self); _tmp1_ = g_strdup ((_tmp0_ != NULL) ? _tmp0_->value_name : NULL); result = _tmp1_; diff --git a/tests/enums/bug666035.c-expected b/tests/enums/bug666035.c-expected index 07da7d02c..2da915d10 100644 --- a/tests/enums/bug666035.c-expected +++ b/tests/enums/bug666035.c-expected @@ -132,7 +132,7 @@ foo_struct_get_type (void) FooEnum takes_enum (FooEnum foo) { - FooEnum result = 0; + FooEnum result; result = foo; return result; } @@ -140,7 +140,7 @@ takes_enum (FooEnum foo) FooEnum gives_enum (void) { - FooEnum result = 0; + FooEnum result; result = FOO_ENUM_MAM; return result; } @@ -148,7 +148,7 @@ gives_enum (void) FooFlag takes_flag (FooFlag foo) { - FooFlag result = 0U; + FooFlag result; result = foo; return result; } @@ -156,7 +156,7 @@ takes_flag (FooFlag foo) FooFlag gives_flag (void) { - FooFlag result = 0U; + FooFlag result; result = FOO_FLAG_MAM | FOO_FLAG_BAR; return result; } diff --git a/tests/enums/enums.c-expected b/tests/enums/enums.c-expected index bef176eac..192a3abc1 100644 --- a/tests/enums/enums.c-expected +++ b/tests/enums/enums.c-expected @@ -95,7 +95,7 @@ maman_foo_get_type (void) gint maman_fooish_something (MamanFooish self) { - gint result = 0; + gint result; result = (gint) self; return result; } @@ -166,7 +166,7 @@ maman_bar_main (void) MamanBar* bar = NULL; MamanBar* _tmp1_; FILE* _tmp2_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Enum Test: 1"); _tmp1_ = maman_bar_new (); diff --git a/tests/errors/bug579101.c-expected b/tests/errors/bug579101.c-expected index 8c6cfb42e..a3b312bab 100644 --- a/tests/errors/bug579101.c-expected +++ b/tests/errors/bug579101.c-expected @@ -69,7 +69,7 @@ do_bar (gint* i) gchar* s = NULL; gchar* _tmp0_; GError* _inner_error0_ = NULL; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("bar"); s = _tmp0_; { @@ -111,7 +111,7 @@ do_manam (gint* i) gchar* s = NULL; gchar* _tmp0_; GError* _inner_error0_ = NULL; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("manam"); s = _tmp0_; { diff --git a/tests/errors/bug627090.c-expected b/tests/errors/bug627090.c-expected index 5343de9e1..389a07ac6 100644 --- a/tests/errors/bug627090.c-expected +++ b/tests/errors/bug627090.c-expected @@ -168,7 +168,7 @@ gchar* manam (GError** error) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("manam"); result = _tmp0_; return result; diff --git a/tests/errors/bug762377.c-expected b/tests/errors/bug762377.c-expected index a2ccd31bf..fdfa10b37 100644 --- a/tests/errors/bug762377.c-expected +++ b/tests/errors/bug762377.c-expected @@ -92,7 +92,7 @@ foo_output_stream_real_close (GOutputStream* base, GError** error) { FooOutputStream * self; - gboolean result = FALSE; + gboolean result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO_OUTPUT_STREAM, FooOutputStream); g_return_val_if_fail ((cancellable == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (cancellable, g_cancellable_get_type ()), FALSE); result = TRUE; diff --git a/tests/errors/bug778224.c-expected b/tests/errors/bug778224.c-expected index 7176e9395..b62036448 100644 --- a/tests/errors/bug778224.c-expected +++ b/tests/errors/bug778224.c-expected @@ -41,7 +41,7 @@ foo (GError** error) { Foo _tmp3_ = {0}; GError* _inner_error0_ = NULL; - Foo result = {0}; + Foo result; if (true) { GError* _tmp0_; _tmp0_ = g_error_new_literal (FOO_ERROR, FOO_ERROR_BAR, ""); diff --git a/tests/errors/errordomain-static-method.c-expected b/tests/errors/errordomain-static-method.c-expected index 47319f68a..f369c2d79 100644 --- a/tests/errors/errordomain-static-method.c-expected +++ b/tests/errors/errordomain-static-method.c-expected @@ -34,7 +34,7 @@ GError* foo_from_string (const gchar* _error_) { GError* _tmp0_; - GError* result = NULL; + GError* result; g_return_val_if_fail (_error_ != NULL, NULL); _vala_assert (g_strcmp0 (_error_, "BAD") == 0, "error == \"BAD\""); _tmp0_ = g_error_new_literal (FOO, FOO_BAD, "BAD"); diff --git a/tests/errors/errors.c-expected b/tests/errors/errors.c-expected index f688fd06f..0732f2f54 100644 --- a/tests/errors/errors.c-expected +++ b/tests/errors/errors.c-expected @@ -105,7 +105,7 @@ bar_bad (Bar* self, { FILE* _tmp0_; GError* _inner_error0_ = NULL; - gint result = 0; + gint result; g_return_val_if_fail (IS_BAR (self), 0); _tmp0_ = stdout; fprintf (_tmp0_, " 5"); diff --git a/tests/generics/bug640330.c-expected b/tests/generics/bug640330.c-expected index 65c9308ef..edcda3bda 100644 --- a/tests/generics/bug640330.c-expected +++ b/tests/generics/bug640330.c-expected @@ -110,7 +110,7 @@ foo_real_get_foo (Foo* self, gpointer _tmp0_; GCompareFunc _tmp1_; gpointer _tmp2_; - gpointer result = NULL; + gpointer result; _vala_assert (FOO_GET_INTERFACE (self)->get_g_type (self) == G_TYPE_STRING, "typeof (G) == typeof (string)"); _tmp0_ = ((g != NULL) && (FOO_GET_INTERFACE (self)->get_g_dup_func (self) != NULL)) ? FOO_GET_INTERFACE (self)->get_g_dup_func (self) ((gpointer) g) : ((gpointer) g); g_copy = _tmp0_; diff --git a/tests/generics/bug694765-1.c-expected b/tests/generics/bug694765-1.c-expected index 77cc98485..221bd42fc 100644 --- a/tests/generics/bug694765-1.c-expected +++ b/tests/generics/bug694765-1.c-expected @@ -36,7 +36,7 @@ copy_list (GType g_type, GList* list) { GList* _result_ = NULL; - GList* result = NULL; + GList* result; _result_ = NULL; { GList* item_collection = NULL; diff --git a/tests/generics/inference-argument-may-fail.c-expected b/tests/generics/inference-argument-may-fail.c-expected index 0bba98d7e..a80cafbc1 100644 --- a/tests/generics/inference-argument-may-fail.c-expected +++ b/tests/generics/inference-argument-may-fail.c-expected @@ -322,7 +322,7 @@ foo_unref (gpointer instance) Foo* foo (GError** error) { - Foo* result = NULL; + Foo* result; result = NULL; return result; } @@ -333,7 +333,7 @@ bar (GType g_type, GDestroyNotify g_destroy_func, Foo* foo) { - gpointer result = NULL; + gpointer result; g_return_val_if_fail ((foo == NULL) || IS_FOO (foo), NULL); result = NULL; return result; diff --git a/tests/generics/inference-static-function.c-expected b/tests/generics/inference-static-function.c-expected index df2182982..2c28dafb0 100644 --- a/tests/generics/inference-static-function.c-expected +++ b/tests/generics/inference-static-function.c-expected @@ -97,7 +97,7 @@ foo_bar (gint* result_length1) gpointer* _tmp0_; gpointer* _tmp1_; gint _tmp1__length1; - gpointer* result = NULL; + gpointer* result; _tmp0_ = g_new0 (gpointer, 0); _tmp1_ = _tmp0_; _tmp1__length1 = 0; diff --git a/tests/generics/integer-type-cast-return.c-expected b/tests/generics/integer-type-cast-return.c-expected index 60222ea7e..47e1ae95c 100644 --- a/tests/generics/integer-type-cast-return.c-expected +++ b/tests/generics/integer-type-cast-return.c-expected @@ -61,7 +61,7 @@ manam (GType t_type, gint* _tmp0_ = NULL; gint* _tmp1_; gint* _tmp2_; - gpointer result = NULL; + gpointer result; _tmp1_ = __int_dup0 (&i); _tmp0_ = _tmp1_; _tmp2_ = _tmp0_; @@ -95,7 +95,7 @@ minim (GType t_type, guint* _tmp0_ = NULL; guint* _tmp1_; guint* _tmp2_; - gpointer result = NULL; + gpointer result; _tmp1_ = __uint_dup0 (&i); _tmp0_ = _tmp1_; _tmp2_ = _tmp0_; diff --git a/tests/generics/value-pointer-type-access.c-expected b/tests/generics/value-pointer-type-access.c-expected index 82670288d..9b7338d8b 100644 --- a/tests/generics/value-pointer-type-access.c-expected +++ b/tests/generics/value-pointer-type-access.c-expected @@ -118,7 +118,7 @@ foo_get_g (Foo* self) { gconstpointer _tmp0_; gpointer _tmp1_; - gpointer result = NULL; + gpointer result; g_return_val_if_fail (IS_FOO (self), NULL); _tmp0_ = self->priv->g; _tmp1_ = ((_tmp0_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp0_) : ((gpointer) _tmp0_); diff --git a/tests/genie/class-signal.c-expected b/tests/genie/class-signal.c-expected index ce9dde3de..6a7be85c1 100644 --- a/tests/genie/class-signal.c-expected +++ b/tests/genie/class-signal.c-expected @@ -126,7 +126,7 @@ main (int argc, gboolean test (gint a) { - gboolean result = FALSE; + gboolean result; result = a == 23; return result; } diff --git a/tests/genie/function-returns-closure.c-expected b/tests/genie/function-returns-closure.c-expected index 5a88a3624..d3e148330 100644 --- a/tests/genie/function-returns-closure.c-expected +++ b/tests/genie/function-returns-closure.c-expected @@ -60,7 +60,7 @@ main (int argc, static gboolean __lambda4_ (void) { - gboolean result = FALSE; + gboolean result; result = TRUE; return result; } @@ -80,7 +80,7 @@ test (gpointer* result_target, TestFunction _tmp0_; gpointer _tmp0__target; GDestroyNotify _tmp0__target_destroy_notify; - TestFunction result = NULL; + TestFunction result; _tmp0_ = ___lambda4__test_function; _tmp0__target = NULL; _tmp0__target_destroy_notify = NULL; diff --git a/tests/genie/function-with-return-value.c-expected b/tests/genie/function-with-return-value.c-expected index f683f8ed5..15b6a8109 100644 --- a/tests/genie/function-with-return-value.c-expected +++ b/tests/genie/function-with-return-value.c-expected @@ -49,7 +49,7 @@ gchar* test (void) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("passed"); result = _tmp0_; return result; diff --git a/tests/genie/init-int.c-expected b/tests/genie/init-int.c-expected index 06ba63331..745372794 100644 --- a/tests/genie/init-int.c-expected +++ b/tests/genie/init-int.c-expected @@ -12,7 +12,7 @@ static gint _vala_main (gchar** args, gint args_length1) { - gint result = 0; + gint result; result = 0; return result; } diff --git a/tests/genie/interface.c-expected b/tests/genie/interface.c-expected index 77b98c6fc..6d2565e61 100644 --- a/tests/genie/interface.c-expected +++ b/tests/genie/interface.c-expected @@ -142,7 +142,7 @@ test_real_test (ITest* base, gint a) { Test * self; - gboolean result = FALSE; + gboolean result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TEST, Test); result = a == 42; return result; diff --git a/tests/genie/literal-template-string.c-expected b/tests/genie/literal-template-string.c-expected index d392fdc78..9dad5e432 100644 --- a/tests/genie/literal-template-string.c-expected +++ b/tests/genie/literal-template-string.c-expected @@ -17,7 +17,7 @@ static void _vala_main (gchar** args, static const gchar* string_to_string (const gchar* self) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (self != NULL, NULL); result = self; return result; diff --git a/tests/methods/argument-array-initilizer.c-expected b/tests/methods/argument-array-initilizer.c-expected index 5dc269565..60bb9d964 100644 --- a/tests/methods/argument-array-initilizer.c-expected +++ b/tests/methods/argument-array-initilizer.c-expected @@ -116,7 +116,7 @@ get_object (GType g_type, GObject** o, gint o_length1) { - gpointer result = NULL; + gpointer result; result = NULL; return result; } @@ -130,7 +130,7 @@ get_foo (void) gint _tmp2__length1; gpointer _tmp3_; Foo* _tmp4_; - Foo* result = NULL; + Foo* result; _tmp0_ = foo_new (); _tmp1_ = g_new0 (GObject*, 1 + 1); _tmp1_[0] = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject); diff --git a/tests/methods/array-length-type.c-expected b/tests/methods/array-length-type.c-expected index 807f80040..7b95a9f9d 100644 --- a/tests/methods/array-length-type.c-expected +++ b/tests/methods/array-length-type.c-expected @@ -295,7 +295,7 @@ foo_real_get_foo (IFoo* base, gint _res_size_; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); _tmp0_ = g_new0 (gint, 255); res = _tmp0_; @@ -346,7 +346,7 @@ foo_real_get_bar (Foo* self, gint _res_size_; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; _tmp0_ = g_new0 (gint, 255); res = _tmp0_; res_length1 = 255; @@ -830,7 +830,7 @@ bar_real_get_bar (Foo* base, gint _res_size_; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); _tmp0_ = g_new0 (gint, 255); res = _tmp0_; @@ -1082,7 +1082,7 @@ get_foo (guint8* result_length1) gint _res_size_; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; _tmp0_ = g_new0 (gint, 255); res = _tmp0_; res_length1 = 255; @@ -1138,7 +1138,7 @@ foo_func (gint* p, gint _tmp0__length1; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; _tmp0_ = (p != NULL) ? _vala_array_dup4 (p, p_length1) : p; _tmp0__length1 = p_length1; _tmp1_ = _tmp0_; @@ -1170,7 +1170,7 @@ ___lambda4_ (gint* a, gint _tmp0__length1; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; _tmp0_ = (a != NULL) ? _vala_array_dup5 (a, a_length1) : a; _tmp0__length1 = a_length1; _tmp1_ = _tmp0_; diff --git a/tests/methods/bug596726.c-expected b/tests/methods/bug596726.c-expected index 5908f7db5..6fa956d62 100644 --- a/tests/methods/bug596726.c-expected +++ b/tests/methods/bug596726.c-expected @@ -84,7 +84,7 @@ do_foo (void) Block1Data* _data1_; GObject* _tmp0_; GObject* _tmp1_; - GObject* result = NULL; + GObject* result; _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; _tmp0_ = g_object_new (G_TYPE_OBJECT, NULL); diff --git a/tests/methods/bug613483.c-expected b/tests/methods/bug613483.c-expected index 2a25a331c..b06fc22ed 100644 --- a/tests/methods/bug613483.c-expected +++ b/tests/methods/bug613483.c-expected @@ -117,7 +117,7 @@ _foo_bar___lambda4_ (Block1Data* _data1_) { Foo* self; gint i = 0; - gboolean result = FALSE; + gboolean result; self = _data1_->self; i = _data1_->value; result = FALSE; diff --git a/tests/methods/bug622570.c-expected b/tests/methods/bug622570.c-expected index 93285b91f..0787494f2 100644 --- a/tests/methods/bug622570.c-expected +++ b/tests/methods/bug622570.c-expected @@ -24,7 +24,7 @@ static void ___lambda5__deleg2 (GValue* foo, static gint __lambda4_ (gint* foo) { - gint result = 0; + gint result; result = (*foo) + 5; return result; } diff --git a/tests/methods/bug626783.c-expected b/tests/methods/bug626783.c-expected index 529233886..ea85282da 100644 --- a/tests/methods/bug626783.c-expected +++ b/tests/methods/bug626783.c-expected @@ -365,7 +365,7 @@ baz (GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func) { - gconstpointer* result = NULL; + gconstpointer* result; result = NULL; return result; } diff --git a/tests/methods/bug639054.c-expected b/tests/methods/bug639054.c-expected index 84343a0fc..4429c8ebb 100644 --- a/tests/methods/bug639054.c-expected +++ b/tests/methods/bug639054.c-expected @@ -163,7 +163,7 @@ block1_data_unref (void * _userdata_) static gboolean __lambda4_ (Block1Data* _data1_) { - gboolean result = FALSE; + gboolean result; _data1_->bar[0] = (guint8) 'b'; _data1_->baz = NULL; result = FALSE; diff --git a/tests/methods/bug642350.c-expected b/tests/methods/bug642350.c-expected index 749255e04..d57a21f4d 100644 --- a/tests/methods/bug642350.c-expected +++ b/tests/methods/bug642350.c-expected @@ -154,7 +154,7 @@ gchar* bar_get_baz (Bar* self) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (IS_BAR (self), NULL); _tmp0_ = g_strdup (N_ ("baz")); result = _tmp0_; diff --git a/tests/methods/bug642885.c-expected b/tests/methods/bug642885.c-expected index b751ce150..542ffde78 100644 --- a/tests/methods/bug642885.c-expected +++ b/tests/methods/bug642885.c-expected @@ -107,7 +107,7 @@ foo_real_local_command_line (GApplication* base, gint _tmp4_ = 0; gboolean _tmp5_; GError* _inner_error0_ = NULL; - gboolean result = FALSE; + gboolean result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); _tmp0_ = g_option_context_new (NULL); option_context = _tmp0_; diff --git a/tests/methods/bug642899.c-expected b/tests/methods/bug642899.c-expected index e8522262f..c474cd963 100644 --- a/tests/methods/bug642899.c-expected +++ b/tests/methods/bug642899.c-expected @@ -121,7 +121,7 @@ __lambda4_ (Block1Data* _data1_) Foo* self; GObject* _tmp0_; GObject* _tmp1_; - gboolean result = FALSE; + gboolean result; self = _data1_->self; _tmp0_ = self->priv->bar; _tmp1_ = _g_object_ref0 (_tmp0_); diff --git a/tests/methods/bug646345.c-expected b/tests/methods/bug646345.c-expected index 2f0d31508..4591c3e12 100644 --- a/tests/methods/bug646345.c-expected +++ b/tests/methods/bug646345.c-expected @@ -53,7 +53,7 @@ static gboolean __lambda4_ (Block1Data* _data1_) { gchar* _tmp0_; - gboolean result = FALSE; + gboolean result; _tmp0_ = g_strdup ("outerbar"); _g_free0 (_data1_->outervar); _data1_->outervar = _tmp0_; @@ -91,7 +91,7 @@ static gboolean __lambda6_ (Block2Data* _data2_) { gchar* _tmp0_; - gboolean result = FALSE; + gboolean result; _tmp0_ = g_strdup ("innerbar"); _g_free0 (_data2_->innervar); _data2_->innervar = _tmp0_; @@ -115,7 +115,7 @@ __lambda5_ (void) GSourceFunc innerfunc = NULL; gpointer innerfunc_target; GDestroyNotify innerfunc_target_destroy_notify; - gboolean result = FALSE; + gboolean result; _data2_ = g_slice_new0 (Block2Data); _data2_->_ref_count_ = 1; _tmp0_ = g_strdup ("innerfoo"); diff --git a/tests/methods/bug648320.c-expected b/tests/methods/bug648320.c-expected index 272b547c8..6a2df7b5c 100644 --- a/tests/methods/bug648320.c-expected +++ b/tests/methods/bug648320.c-expected @@ -74,7 +74,7 @@ __lambda4_ (Block1Data* _data1_) Foo* self; gint _tmp0_; gint _tmp1_; - gboolean result = FALSE; + gboolean result; self = _data1_->self; _tmp0_ = foo_get_i (self); _tmp1_ = _tmp0_; diff --git a/tests/methods/bug649562.c-expected b/tests/methods/bug649562.c-expected index b1be937c5..ec1d60c13 100644 --- a/tests/methods/bug649562.c-expected +++ b/tests/methods/bug649562.c-expected @@ -11,7 +11,7 @@ static gboolean __lambda4_ (void) { static const gint b = 3; - gboolean result = FALSE; + gboolean result; result = FALSE; return result; } diff --git a/tests/methods/bug652098.c-expected b/tests/methods/bug652098.c-expected index 81acc0910..8a07c5d55 100644 --- a/tests/methods/bug652098.c-expected +++ b/tests/methods/bug652098.c-expected @@ -288,7 +288,7 @@ static gint obj1_real_iface1_foo (Iface1* base) { Obj1 * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OBJ1, Obj1); result = 1; return result; @@ -298,7 +298,7 @@ static gint obj1_real_iface2_foo (Iface2* base) { Obj1 * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OBJ1, Obj1); result = 2; return result; @@ -376,7 +376,7 @@ static gint obj2_real_iface1_foo (Iface1* base) { Obj2 * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OBJ2, Obj2); result = 1; return result; @@ -386,7 +386,7 @@ static gint obj2_real_foo (Iface2* base) { Obj2 * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OBJ2, Obj2); result = 2; return result; @@ -463,7 +463,7 @@ obj2_get_type (void) gint base_foo (Base* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_BASE (self), 0); result = 42; return result; diff --git a/tests/methods/bug653391.c-expected b/tests/methods/bug653391.c-expected index 58535062b..1f9c89ea6 100644 --- a/tests/methods/bug653391.c-expected +++ b/tests/methods/bug653391.c-expected @@ -59,7 +59,7 @@ static gchar* __lambda4_ (Block1Data* _data1_) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup (_data1_->bar); result = _tmp0_; return result; @@ -82,7 +82,7 @@ foo (gchar* bar, Deleg _tmp0_; gpointer _tmp0__target; GDestroyNotify _tmp0__target_destroy_notify; - Deleg result = NULL; + Deleg result; g_return_val_if_fail (bar != NULL, NULL); _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; diff --git a/tests/methods/bug653908.c-expected b/tests/methods/bug653908.c-expected index 5d68d6fc7..891aacdc3 100644 --- a/tests/methods/bug653908.c-expected +++ b/tests/methods/bug653908.c-expected @@ -44,7 +44,7 @@ foo (gint* result_length1) gint _tmp0__length1; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; bar[7] = 42; _tmp0_ = _vala_array_dup1 (bar, 8); _tmp0__length1 = 8; diff --git a/tests/methods/bug663210.c-expected b/tests/methods/bug663210.c-expected index e51ba76f4..5dd62fd0d 100644 --- a/tests/methods/bug663210.c-expected +++ b/tests/methods/bug663210.c-expected @@ -117,7 +117,7 @@ __lambda4_ (Block1Data* _data1_) GType t_type; GBoxedCopyFunc t_dup_func; GDestroyNotify t_destroy_func; - gboolean result = FALSE; + gboolean result; self = _data1_->self; t_type = _data1_->t_type; t_dup_func = _data1_->t_dup_func; diff --git a/tests/methods/bug699956.c-expected b/tests/methods/bug699956.c-expected index 22a2e5bf2..b4d6a760e 100644 --- a/tests/methods/bug699956.c-expected +++ b/tests/methods/bug699956.c-expected @@ -356,7 +356,7 @@ bar_get_type (void) Foo* foo (void) { - Bar* result = NULL; + Bar* result; result = NULL; return result; } diff --git a/tests/methods/bug723009.c-expected b/tests/methods/bug723009.c-expected index cbcccfda4..f7376c656 100644 --- a/tests/methods/bug723009.c-expected +++ b/tests/methods/bug723009.c-expected @@ -29,7 +29,7 @@ gchar* foo (GError** error) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("foo"); result = _tmp0_; return result; diff --git a/tests/methods/bug723195.c-expected b/tests/methods/bug723195.c-expected index 4ba16552b..17bfd3c52 100644 --- a/tests/methods/bug723195.c-expected +++ b/tests/methods/bug723195.c-expected @@ -25,7 +25,7 @@ _vala_g_strjoinv (const gchar* separator, gint str_array_length1) { gboolean _tmp0_ = FALSE; - gchar* result = NULL; + gchar* result; if (separator == NULL) { separator = ""; } diff --git a/tests/methods/bug726347.c-expected b/tests/methods/bug726347.c-expected index 0303b9f1c..54108bbaf 100644 --- a/tests/methods/bug726347.c-expected +++ b/tests/methods/bug726347.c-expected @@ -81,7 +81,7 @@ foo_count_strings (Foo* self, { gint i = 0; va_list args = {0}; - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); i = 0; va_start (args, self); diff --git a/tests/methods/bug737222.c-expected b/tests/methods/bug737222.c-expected index af1a4779f..c79c0cd51 100644 --- a/tests/methods/bug737222.c-expected +++ b/tests/methods/bug737222.c-expected @@ -37,7 +37,7 @@ foo (gint* result_length1) gint* _tmp0_; gint* _tmp1_; gint _tmp1__length1; - gint* result = NULL; + gint* result; _tmp0_ = g_new0 (gint, 1); _tmp1_ = _tmp0_; _tmp1__length1 = 1; @@ -55,7 +55,7 @@ bar (void) gchar* _tmp0_; gchar** _tmp1_; const gchar* _tmp2_; - gchar** result = NULL; + gchar** result; _tmp0_ = g_strdup ("bar"); _tmp1_ = g_new0 (gchar*, 1 + 1); _tmp1_[0] = _tmp0_; diff --git a/tests/methods/bug771964.c-expected b/tests/methods/bug771964.c-expected index c2d07e25d..13a74c4e8 100644 --- a/tests/methods/bug771964.c-expected +++ b/tests/methods/bug771964.c-expected @@ -235,7 +235,7 @@ _vala_main (void) { Bar* obj = NULL; Bar* _tmp0_; - gint result = 0; + gint result; _tmp0_ = bar_new (); obj = _tmp0_; foo_test (G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FOO, Foo), G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, "test"); diff --git a/tests/methods/bug774060.c-expected b/tests/methods/bug774060.c-expected index addb5eabc..28066f5d5 100644 --- a/tests/methods/bug774060.c-expected +++ b/tests/methods/bug774060.c-expected @@ -74,7 +74,7 @@ foo_format (Foo* self, gint baz, const gchar* format) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (IS_FOO (self), NULL); g_return_val_if_fail (bar != NULL, NULL); g_return_val_if_fail (format != NULL, NULL); @@ -88,7 +88,7 @@ foo_format_pos (const gchar* bar, const gchar* format, Foo* self) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (IS_FOO (self), NULL); g_return_val_if_fail (bar != NULL, NULL); g_return_val_if_fail (format != NULL, NULL); @@ -102,7 +102,7 @@ foo_real_format_virtual (Foo* self, gint baz, const gchar* format) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (bar != NULL, NULL); g_return_val_if_fail (format != NULL, NULL); result = format; @@ -114,7 +114,7 @@ foo_format_static (const gchar* foo, gint baz, const gchar* format) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (foo != NULL, NULL); g_return_val_if_fail (format != NULL, NULL); result = format; @@ -173,7 +173,7 @@ foo_get_type (void) const gchar* format_wrapper (const gchar* format) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (format != NULL, NULL); result = format; return result; diff --git a/tests/methods/bug784691.c-expected b/tests/methods/bug784691.c-expected index dd0bf7502..7c7ccccec 100644 --- a/tests/methods/bug784691.c-expected +++ b/tests/methods/bug784691.c-expected @@ -26,7 +26,7 @@ const gint FOO[3] = {0, 1, 2}; gint* get_foo (void) { - gint* result = NULL; + gint* result; _vala_assert (G_N_ELEMENTS (FOO) == 3, "FOO.length == 3"); result = FOO; return result; diff --git a/tests/methods/bug791283.c-expected b/tests/methods/bug791283.c-expected index a0e1c4387..e83808f75 100644 --- a/tests/methods/bug791283.c-expected +++ b/tests/methods/bug791283.c-expected @@ -326,7 +326,7 @@ create_bar (GType g_type, GDestroyNotify g_destroy_func) { GPtrArray* _tmp0_; - GPtrArray* result = NULL; + GPtrArray* result; _tmp0_ = g_ptr_array_new_full ((guint) 0, g_destroy_func); result = _tmp0_; return result; diff --git a/tests/methods/closures.c-expected b/tests/methods/closures.c-expected index 22c5f2c97..04d0bc022 100644 --- a/tests/methods/closures.c-expected +++ b/tests/methods/closures.c-expected @@ -159,7 +159,7 @@ static gboolean __lambda4_ (Block1Data* _data1_) { Foo* self; - gboolean result = FALSE; + gboolean result; self = _data1_->self; _g_object_unref0 (_data1_->o); _data1_->o = NULL; @@ -291,7 +291,7 @@ __lambda5_ (Block2Data* _data2_) { Func _tmp0_; gpointer _tmp0__target; - gint result = 0; + gint result; _data2_->k = _data2_->k - 1; _tmp0_ = _data2_->B; _tmp0__target = _data2_->B_target; @@ -322,7 +322,7 @@ A (gint k, { Block2Data* _data2_; gint _tmp0_ = 0; - gint result = 0; + gint result; _data2_ = g_slice_new0 (Block2Data); _data2_->_ref_count_ = 1; _data2_->k = k; @@ -379,7 +379,7 @@ block3_data_unref (void * _userdata_) static gint __lambda6_ (Block3Data* _data3_) { - gint result = 0; + gint result; _data3_->array = NULL; _data3_->func (); result = 0; @@ -420,7 +420,7 @@ B (gint* array, static gint __lambda7_ (void) { - gint result = 0; + gint result; result = 1; return result; } @@ -436,7 +436,7 @@ ___lambda7__func (gpointer self) static gint __lambda8_ (void) { - gint result = 0; + gint result; result = -1; return result; } @@ -452,7 +452,7 @@ ___lambda8__func (gpointer self) static gint __lambda9_ (void) { - gint result = 0; + gint result; result = -1; return result; } @@ -468,7 +468,7 @@ ___lambda9__func (gpointer self) static gint __lambda10_ (void) { - gint result = 0; + gint result; result = 1; return result; } @@ -484,7 +484,7 @@ ___lambda10__func (gpointer self) static gint __lambda11_ (void) { - gint result = 0; + gint result; result = 0; return result; } diff --git a/tests/methods/contains.c-expected b/tests/methods/contains.c-expected index 8d55e8330..4bf0648b4 100644 --- a/tests/methods/contains.c-expected +++ b/tests/methods/contains.c-expected @@ -75,7 +75,7 @@ gboolean foo_contains (Foo* self, gint item) { - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (IS_FOO (self), FALSE); result = item == 42; return result; diff --git a/tests/methods/delegate-target.c-expected b/tests/methods/delegate-target.c-expected index ceaddff03..56300d248 100644 --- a/tests/methods/delegate-target.c-expected +++ b/tests/methods/delegate-target.c-expected @@ -224,7 +224,7 @@ ___lambda4__foo_func (gpointer self) static FooFunc foo_real_get_foo (Foo* self) { - FooFunc result = NULL; + FooFunc result; result = ___lambda4__foo_func; return result; } @@ -275,7 +275,7 @@ ___lambda5__foo_func (gpointer self) static FooFunc foo_real_get_bar (Foo* self) { - FooFunc result = NULL; + FooFunc result; result = ___lambda5__foo_func; return result; } @@ -585,7 +585,7 @@ static FooFunc bar_real_get_foo (Foo* base) { Bar * self; - FooFunc result = NULL; + FooFunc result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); result = ___lambda7__foo_func; return result; @@ -616,7 +616,7 @@ static FooFunc bar_real_get_bar (Foo* base) { Bar * self; - FooFunc result = NULL; + FooFunc result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); result = ___lambda8__foo_func; return result; @@ -758,7 +758,7 @@ ___lambda11__foo_func (gpointer self) FooFunc get_foo (void) { - FooFunc result = NULL; + FooFunc result; result = ___lambda11__foo_func; return result; } diff --git a/tests/methods/generics.c-expected b/tests/methods/generics.c-expected index 5cf5065b2..44fb6b31b 100644 --- a/tests/methods/generics.c-expected +++ b/tests/methods/generics.c-expected @@ -456,7 +456,7 @@ is_check (GType g_type, { Bar* o = NULL; Bar* _tmp0_; - gboolean result = FALSE; + gboolean result; _tmp0_ = bar_new (); o = _tmp0_; result = G_TYPE_CHECK_INSTANCE_TYPE (o, g_type); diff --git a/tests/methods/iterator.c-expected b/tests/methods/iterator.c-expected index 3565c88ff..33a565863 100644 --- a/tests/methods/iterator.c-expected +++ b/tests/methods/iterator.c-expected @@ -765,7 +765,7 @@ foo_iterator_get_instance_private (FooIterator* self) gboolean foo_iterator_next (FooIterator* self) { - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (IS_FOO_ITERATOR (self), FALSE); result = !self->priv->called; return result; @@ -782,7 +782,7 @@ foo_iterator_get (FooIterator* self) { Foo* _tmp0_; Foo* _tmp1_; - Foo* result = NULL; + Foo* result; g_return_val_if_fail (IS_FOO_ITERATOR (self), NULL); _vala_assert (!self->priv->called, "!called"); self->priv->called = TRUE; @@ -1013,7 +1013,7 @@ FooIterator* foo_collection_iterator (FooCollection* self) { FooIterator* _tmp0_; - FooIterator* result = NULL; + FooIterator* result; g_return_val_if_fail (IS_FOO_COLLECTION (self), NULL); _tmp0_ = foo_iterator_new (); result = _tmp0_; @@ -1244,7 +1244,7 @@ foo_iterator2_next_value (FooIterator2* self) { Foo* _tmp0_; Foo* _tmp1_; - Foo* result = NULL; + Foo* result; g_return_val_if_fail (IS_FOO_ITERATOR2 (self), NULL); if (self->priv->called) { result = NULL; @@ -1478,7 +1478,7 @@ FooIterator2* foo_collection2_iterator (FooCollection2* self) { FooIterator2* _tmp0_; - FooIterator2* result = NULL; + FooIterator2* result; g_return_val_if_fail (IS_FOO_COLLECTION2 (self), NULL); _tmp0_ = foo_iterator2_new (); result = _tmp0_; @@ -1704,7 +1704,7 @@ foo_collection3_get (FooCollection3* self, { Foo* _tmp0_; Foo* _tmp1_; - Foo* result = NULL; + Foo* result; g_return_val_if_fail (IS_FOO_COLLECTION3 (self), NULL); _vala_assert (index == 0, "index == 0"); _tmp0_ = foo_instance; @@ -2235,7 +2235,7 @@ foo_iterator4_get_instance_private (FooIterator4* self) gboolean foo_iterator4_next (FooIterator4* self) { - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (IS_FOO_ITERATOR4 (self), FALSE); result = !self->priv->called; return result; @@ -2246,7 +2246,7 @@ foo_iterator4_get (FooIterator4* self) { Foo* _tmp0_; FooEntry4* _tmp1_; - gpointer result = NULL; + gpointer result; g_return_val_if_fail (IS_FOO_ITERATOR4 (self), NULL); _vala_assert (!self->priv->called, "!called"); self->priv->called = TRUE; @@ -2493,7 +2493,7 @@ foo_collection4_get (FooCollection4* self, { Foo* _tmp0_; gpointer _tmp1_; - gpointer result = NULL; + gpointer result; g_return_val_if_fail (IS_FOO_COLLECTION4 (self), NULL); _vala_assert (g_strcmp0 (key, "foo") == 0, "key == \"foo\""); _tmp0_ = foo_instance; @@ -2506,7 +2506,7 @@ FooIterator4* foo_collection4_iterator (FooCollection4* self) { FooIterator4* _tmp0_; - FooIterator4* result = NULL; + FooIterator4* result; g_return_val_if_fail (IS_FOO_COLLECTION4 (self), NULL); _tmp0_ = foo_iterator4_new (TYPE_FOO_ENTRY4, (GBoxedCopyFunc) foo_entry4_ref, (GDestroyNotify) foo_entry4_unref); result = _tmp0_; diff --git a/tests/methods/lambda.c-expected b/tests/methods/lambda.c-expected index fad928709..0ca1dc91b 100644 --- a/tests/methods/lambda.c-expected +++ b/tests/methods/lambda.c-expected @@ -70,7 +70,7 @@ static GType maman_bar_get_type_once (void); static gint maman_bar_do_action (MamanActionCallback cb) { - gint result = 0; + gint result; result = cb (1); return result; } @@ -80,7 +80,7 @@ maman_bar_do_out_action (MamanActionOutCallback cb) { gint i = 0; gint _tmp0_ = 0; - gint result = 0; + gint result; cb (&_tmp0_); i = _tmp0_; result = i; @@ -91,7 +91,7 @@ static gint maman_bar_do_ref_action (MamanActionRefCallback cb) { gint i = 0; - gint result = 0; + gint result; i = 1; cb (&i); result = i; @@ -101,7 +101,7 @@ maman_bar_do_ref_action (MamanActionRefCallback cb) static gint __lambda4_ (gint i) { - gint result = 0; + gint result; result = i * 2; return result; } @@ -117,7 +117,7 @@ ___lambda4__maman_action_callback (gint i) static gint __lambda5_ (gint i) { - gint result = 0; + gint result; result = i * 3; return result; } @@ -161,7 +161,7 @@ ___lambda7__maman_action_ref_callback (gint* i) static gint maman_bar_main (void) { - gint result = 0; + gint result; _vala_assert (maman_bar_do_action (___lambda4__maman_action_callback) == 2, "do_action (i => i * 2) == 2"); _vala_assert (maman_bar_do_action (___lambda5__maman_action_callback) == 3, "do_action (i => { return i * 3; }) == 3"); _vala_assert (maman_bar_do_out_action (___lambda6__maman_action_out_callback) == 4, "do_out_action ((out i) => { i = 4; }) == 4"); diff --git a/tests/methods/local-functions.c-expected b/tests/methods/local-functions.c-expected index fadc17878..92ac20ce4 100644 --- a/tests/methods/local-functions.c-expected +++ b/tests/methods/local-functions.c-expected @@ -59,7 +59,7 @@ block1_data_unref (void * _userdata_) static gint ___lambda4_ (Block1Data* _data1_) { - gint result = 0; + gint result; result = _data1_->x + _data1_->y; return result; } @@ -76,7 +76,7 @@ static gboolean ___lambda5_ (gint a, gint b) { - gboolean result = FALSE; + gboolean result; _vala_assert ((a * b) == 966, "a * b == 966"); result = TRUE; return result; @@ -118,7 +118,7 @@ static const gchar* ___lambda7_ (gchar** s) { gchar* _tmp0_; - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (*s != NULL, NULL); _vala_assert (g_strcmp0 (*s, "foo") == 0, "s == \"foo\""); _tmp0_ = g_strdup ("bar"); diff --git a/tests/methods/nowrapper-interface.c-expected b/tests/methods/nowrapper-interface.c-expected index a3ba046f3..ef4002a98 100644 --- a/tests/methods/nowrapper-interface.c-expected +++ b/tests/methods/nowrapper-interface.c-expected @@ -102,7 +102,7 @@ static gint foo_real_bar (IFoo* base) { Foo * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); result = 42; return result; diff --git a/tests/methods/parameter-ref-delegate.c-expected b/tests/methods/parameter-ref-delegate.c-expected index dab6bf147..dafddddf6 100644 --- a/tests/methods/parameter-ref-delegate.c-expected +++ b/tests/methods/parameter-ref-delegate.c-expected @@ -42,7 +42,7 @@ static gint ____lambda5__foo_func (gpointer self); static gint __lambda4_ (void) { - gint result = 0; + gint result; result = 4711; return result; } @@ -74,7 +74,7 @@ foo (gint i, gint bar (void) { - gint result = 0; + gint result; result = 23; return result; } @@ -107,7 +107,7 @@ block1_data_unref (void * _userdata_) static gint ___lambda5_ (Block1Data* _data1_) { - gint result = 0; + gint result; result = _data1_->i; return result; } diff --git a/tests/methods/postconditions-temp-variables.c-expected b/tests/methods/postconditions-temp-variables.c-expected index 2609bcf30..fbc76445f 100644 --- a/tests/methods/postconditions-temp-variables.c-expected +++ b/tests/methods/postconditions-temp-variables.c-expected @@ -28,7 +28,7 @@ static void _vala_main (void); static const gchar* string_to_string (const gchar* self) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (self != NULL, NULL); result = self; return result; @@ -39,7 +39,7 @@ foo (void) { gchar* _tmp0_; const gchar* _tmp1_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup_printf ("%i", 4711); result = _tmp0_; _tmp1_ = string_to_string (result); @@ -50,7 +50,7 @@ foo (void) gchar* bar (gboolean b) { - gchar* result = NULL; + gchar* result; if (b) { gchar* _tmp0_; const gchar* _tmp1_; diff --git a/tests/methods/postconditions.c-expected b/tests/methods/postconditions.c-expected index 0dc918850..f577e535d 100644 --- a/tests/methods/postconditions.c-expected +++ b/tests/methods/postconditions.c-expected @@ -114,7 +114,7 @@ bar (gchar** a, gint _tmp2__length1; const gchar* _tmp3_; const gchar* _tmp4_; - gchar** result = NULL; + gchar** result; _tmp0_ = g_strdup ("manam"); _tmp1_ = g_new0 (gchar*, 1 + 1); _tmp1_[0] = _tmp0_; @@ -145,7 +145,7 @@ baz (gchar*** a, gint _tmp5__length1; const gchar* _tmp6_; const gchar* _tmp7_; - gchar** result = NULL; + gchar** result; _tmp0_ = g_strdup ("bar"); _tmp1_ = g_strdup ("foo"); _tmp2_ = g_new0 (gchar*, 2 + 1); @@ -185,7 +185,7 @@ bam (gchar*** a, gint _tmp5__length1; const gchar* _tmp6_; const gchar* _tmp7_; - gchar** result = NULL; + gchar** result; _tmp0_ = g_strdup ("bar"); _tmp1_ = g_strdup ("foo"); _tmp2_ = g_new0 (gchar*, 2 + 1); diff --git a/tests/methods/preconditions-temp-variables.c-expected b/tests/methods/preconditions-temp-variables.c-expected index f8436bb26..25d4267b3 100644 --- a/tests/methods/preconditions-temp-variables.c-expected +++ b/tests/methods/preconditions-temp-variables.c-expected @@ -33,7 +33,7 @@ foo (gint i) gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup_printf ("%i", i); _tmp1_ = _tmp0_; _tmp2_ = g_strdup_printf ("%i", i); diff --git a/tests/methods/prepostconditions-captured.c-expected b/tests/methods/prepostconditions-captured.c-expected index 829c31743..7d8484f55 100644 --- a/tests/methods/prepostconditions-captured.c-expected +++ b/tests/methods/prepostconditions-captured.c-expected @@ -112,7 +112,7 @@ bar (gint i) Func f = NULL; gpointer f_target; GDestroyNotify f_target_destroy_notify; - gint result = 0; + gint result; _vala_return_val_if_fail (i == 23, "i == 23", 0); _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; diff --git a/tests/methods/prepostconditions-contains.c-expected b/tests/methods/prepostconditions-contains.c-expected index f1cd71e0c..5409cd218 100644 --- a/tests/methods/prepostconditions-contains.c-expected +++ b/tests/methods/prepostconditions-contains.c-expected @@ -55,7 +55,7 @@ gchar* bar (void) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("manam"); result = _tmp0_; _vala_warn_if_fail (_vala_string_array_contains (array, G_N_ELEMENTS (array), result), "result in array"); diff --git a/tests/methods/prepostconditions.c-expected b/tests/methods/prepostconditions.c-expected index a0c565293..6371fc544 100644 --- a/tests/methods/prepostconditions.c-expected +++ b/tests/methods/prepostconditions.c-expected @@ -157,7 +157,7 @@ foo_bar (Foo* self) gchar* _tmp0_; gint _tmp1_; gint _tmp2_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (IS_FOO (self), NULL); _tmp0_ = g_strdup ("bar"); result = _tmp0_; @@ -180,7 +180,7 @@ gint foo_bar_pre (Foo* self, gint i) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); _vala_return_val_if_fail (i > 42, "i > 42", 0); _vala_assert (i == 4711, "i == 4711"); @@ -192,7 +192,7 @@ gint foo_faz (Foo* self, gint i) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); switch (i) { case 42: @@ -212,7 +212,7 @@ gint foo_faz_pre (Foo* self, gint i) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); _vala_return_val_if_fail (i > 23, "i > 23", 0); switch (i) { @@ -232,7 +232,7 @@ static gint foo_real_manam (Foo* self, gint i) { - gint result = 0; + gint result; switch (i) { case 67: { @@ -267,7 +267,7 @@ static gint foo_real_manam_pre (Foo* self, gint i) { - gint result = 0; + gint result; _vala_return_val_if_fail (i > 23, "i > 23", 0); switch (i) { case 231: @@ -528,7 +528,7 @@ bar_foo (Bar *self) gchar* _tmp0_; gint _tmp1_; gint _tmp2_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("foo"); result = _tmp0_; _tmp1_ = strlen (result); diff --git a/tests/methods/print-attribute.c-expected b/tests/methods/print-attribute.c-expected index 55f40f943..303d5825e 100644 --- a/tests/methods/print-attribute.c-expected +++ b/tests/methods/print-attribute.c-expected @@ -335,7 +335,7 @@ bar (const gchar* s, static gchar* bool_to_string (gboolean self) { - gchar* result = NULL; + gchar* result; if (self) { gchar* _tmp0_; _tmp0_ = g_strdup ("true"); diff --git a/tests/methods/profile.c-expected b/tests/methods/profile.c-expected index 024545610..9a0bba52b 100644 --- a/tests/methods/profile.c-expected +++ b/tests/methods/profile.c-expected @@ -76,7 +76,7 @@ _vala_prof_bar_exit (void) gint bar (gboolean b) { - gint result = 0; + gint result; if (!(_vala_prof_bar_level++)) { _vala_prof_bar_counter++; g_timer_continue (_vala_prof_bar_timer); diff --git a/tests/methods/return-unowned-delegate.c-expected b/tests/methods/return-unowned-delegate.c-expected index cb8d2fa83..96904ba1e 100644 --- a/tests/methods/return-unowned-delegate.c-expected +++ b/tests/methods/return-unowned-delegate.c-expected @@ -31,7 +31,7 @@ foo (gpointer* result_target) { FooFunc _tmp0_; gpointer _tmp0__target; - FooFunc result = NULL; + FooFunc result; _tmp0_ = (FooFunc) manam; _tmp0__target = NULL; *result_target = _tmp0__target; @@ -42,7 +42,7 @@ foo (gpointer* result_target) static gint __lambda4_ (void) { - gint result = 0; + gint result; result = 4711; return result; } @@ -60,7 +60,7 @@ bar (gpointer* result_target) { FooFunc _tmp0_; gpointer _tmp0__target; - FooFunc result = NULL; + FooFunc result; _tmp0_ = ___lambda4__foo_func; _tmp0__target = NULL; *result_target = _tmp0__target; @@ -71,7 +71,7 @@ bar (gpointer* result_target) gint manam (void) { - gint result = 0; + gint result; result = 42; return result; } diff --git a/tests/methods/same-name.c-expected b/tests/methods/same-name.c-expected index 17167174a..d17da2c2a 100644 --- a/tests/methods/same-name.c-expected +++ b/tests/methods/same-name.c-expected @@ -131,7 +131,7 @@ static gboolean foo_real_ifoo_foo (IFoo* base) { Foo * self; - gboolean result = FALSE; + gboolean result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); result = TRUE; return result; @@ -140,7 +140,7 @@ foo_real_ifoo_foo (IFoo* base) gint foo_foo (Foo* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); result = 42; return result; diff --git a/tests/methods/varargs-delegate-without-target.c-expected b/tests/methods/varargs-delegate-without-target.c-expected index 1a3e6e639..5b8caa481 100644 --- a/tests/methods/varargs-delegate-without-target.c-expected +++ b/tests/methods/varargs-delegate-without-target.c-expected @@ -34,7 +34,7 @@ gchar* foo (void* data) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("foo"); result = _tmp0_; return result; diff --git a/tests/methods/varargs-delegate.c-expected b/tests/methods/varargs-delegate.c-expected index a30390565..2a20d4e15 100644 --- a/tests/methods/varargs-delegate.c-expected +++ b/tests/methods/varargs-delegate.c-expected @@ -34,7 +34,7 @@ gchar* foo (void* data) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("foo"); result = _tmp0_; return result; diff --git a/tests/methods/varargs-out.c-expected b/tests/methods/varargs-out.c-expected index adf27b865..ed87a28dc 100644 --- a/tests/methods/varargs-out.c-expected +++ b/tests/methods/varargs-out.c-expected @@ -255,7 +255,7 @@ get_foo_varg (const gchar* s, Foo** _tmp0_; Foo* _tmp1_; GObject* _tmp2_; - gboolean result = FALSE; + gboolean result; g_return_val_if_fail (s != NULL, FALSE); va_start (args, s); _tmp0_ = va_arg (args, Foo**); diff --git a/tests/namespace/unique.c-expected b/tests/namespace/unique.c-expected index 41ed4a820..2aecacf17 100644 --- a/tests/namespace/unique.c-expected +++ b/tests/namespace/unique.c-expected @@ -287,7 +287,7 @@ g_vala_foo_unref (gpointer instance) gint g_vala_foo (void) { - gint result = 0; + gint result; result = 42; return result; } diff --git a/tests/objects/bug597155.c-expected b/tests/objects/bug597155.c-expected index e0f8c5a77..6db1b3142 100644 --- a/tests/objects/bug597155.c-expected +++ b/tests/objects/bug597155.c-expected @@ -162,7 +162,7 @@ do_foo (void) Block1Data* _data1_; Foo* _tmp0_; Foo* _tmp1_; - Foo* result = NULL; + Foo* result; _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; _tmp0_ = foo_new (); diff --git a/tests/objects/bug634782.c-expected b/tests/objects/bug634782.c-expected index 26f1397f5..0753c7318 100644 --- a/tests/objects/bug634782.c-expected +++ b/tests/objects/bug634782.c-expected @@ -77,7 +77,7 @@ Foo* foo_bar (Foo* self) { Foo* _tmp0_; - Foo* result = NULL; + Foo* result; g_return_val_if_fail (IS_FOO (self), NULL); _tmp0_ = foo_new (); result = _tmp0_; diff --git a/tests/objects/bug641828.c-expected b/tests/objects/bug641828.c-expected index cc9b533ec..d1cd5fb34 100644 --- a/tests/objects/bug641828.c-expected +++ b/tests/objects/bug641828.c-expected @@ -201,7 +201,7 @@ foo_get_type (void) static gint __lambda4_ (gint i) { - gint result = 0; + gint result; result = i + 12; return result; } diff --git a/tests/objects/bug646362.c-expected b/tests/objects/bug646362.c-expected index 733d13a2f..886702810 100644 --- a/tests/objects/bug646362.c-expected +++ b/tests/objects/bug646362.c-expected @@ -94,7 +94,7 @@ static gboolean _foo___lambda4_ (Block1Data* _data1_) { Foo* self; - gboolean result = FALSE; + gboolean result; self = _data1_->self; result = _data1_->baz == 2; return result; diff --git a/tests/objects/bug663134.c-expected b/tests/objects/bug663134.c-expected index cb3a1bc4e..6797802cf 100644 --- a/tests/objects/bug663134.c-expected +++ b/tests/objects/bug663134.c-expected @@ -124,7 +124,7 @@ static gboolean __lambda5_ (Block1Data* _data1_) { Foo* self; - gboolean result = FALSE; + gboolean result; self = _data1_->self; ((_data1_->baz == NULL) || (self->priv->t_destroy_func == NULL)) ? NULL : (_data1_->baz = (self->priv->t_destroy_func (_data1_->baz), NULL)); _data1_->baz = NULL; @@ -147,7 +147,7 @@ __lambda4_ (Block1Data* _data1_) GSourceFunc ff = NULL; gpointer ff_target; GDestroyNotify ff_target_destroy_notify; - gboolean result = FALSE; + gboolean result; self = _data1_->self; ((_data1_->baz == NULL) || (self->priv->t_destroy_func == NULL)) ? NULL : (_data1_->baz = (self->priv->t_destroy_func (_data1_->baz), NULL)); _data1_->baz = NULL; diff --git a/tests/objects/bug681356.c-expected b/tests/objects/bug681356.c-expected index 0f919bb63..20113ea63 100644 --- a/tests/objects/bug681356.c-expected +++ b/tests/objects/bug681356.c-expected @@ -89,7 +89,7 @@ foo_bar (Foo* self, gint i) { gint _tmp0_ = 0; - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); g_signal_emit (self, foo_signals[FOO_BAR_SIGNAL], 0, i, &_tmp0_); result = _tmp0_; @@ -163,7 +163,7 @@ foo_get_type (void) static gint __lambda4_ (gint i) { - gint result = 0; + gint result; result = i + 12; return result; } diff --git a/tests/objects/bug695671.c-expected b/tests/objects/bug695671.c-expected index 240f74971..2aaa10299 100644 --- a/tests/objects/bug695671.c-expected +++ b/tests/objects/bug695671.c-expected @@ -113,7 +113,7 @@ ref_generic (GType g_type, gconstpointer o) { gpointer _tmp0_; - gpointer result = NULL; + gpointer result; _tmp0_ = ((o != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) o) : ((gpointer) o); result = _tmp0_; return result; @@ -129,7 +129,7 @@ GObject* ref (GObject* o) { GObject* _tmp0_; - GObject* result = NULL; + GObject* result; g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT), NULL); _tmp0_ = _g_object_ref0 (o); result = _tmp0_; diff --git a/tests/objects/bug741465.c-expected b/tests/objects/bug741465.c-expected index a572f1684..65e83ec69 100644 --- a/tests/objects/bug741465.c-expected +++ b/tests/objects/bug741465.c-expected @@ -155,7 +155,7 @@ static const gchar* foo_real_foo (AbstractFoo* base) { Foo * self; - const gchar* result = NULL; + const gchar* result; self = (Foo*) base; result = "Foo"; return result; @@ -208,7 +208,7 @@ static const gchar* bar_real_foo (AbstractFoo* base) { Bar * self; - const gchar* result = NULL; + const gchar* result; self = (Bar*) base; result = "Bar"; return result; @@ -244,7 +244,7 @@ bar_instance_init (Bar * self) static const gchar* manam_real_foo (Manam* self) { - const gchar* result = NULL; + const gchar* result; result = "Manam"; return result; } @@ -262,7 +262,7 @@ manam_foo (Manam* self) static gint manam_real_foo_plain (Manam* self) { - gint result = 0; + gint result; result = 13; return result; } @@ -335,7 +335,7 @@ static const gchar* baz_real_foo (Manam* base) { Baz * self; - const gchar* result = NULL; + const gchar* result; self = (Baz*) base; result = "Baz"; return result; @@ -345,7 +345,7 @@ static gint baz_real_foo_plain (Manam* base) { Baz * self; - gint result = 0; + gint result; self = (Baz*) base; result = 23; return result; diff --git a/tests/objects/bug758816.c-expected b/tests/objects/bug758816.c-expected index ed840464e..8a6813c49 100644 --- a/tests/objects/bug758816.c-expected +++ b/tests/objects/bug758816.c-expected @@ -423,7 +423,7 @@ callback_bar (void) { Bar _tmp0_; Bar* _tmp1_; - Bar* result = NULL; + Bar* result; _tmp0_ = BAR_FOO; _tmp1_ = __bar_dup0 (&_tmp0_); result = _tmp1_; @@ -435,7 +435,7 @@ callback_bar2 (Bar* bar) { Bar _tmp0_; Bar* _tmp1_; - Bar* result = NULL; + Bar* result; _tmp0_ = BAR_BAZ; _vala_assert (_bar_equal (bar, &_tmp0_) == TRUE, "bar == Bar.BAZ"); _tmp1_ = __bar_dup0 (bar); @@ -448,7 +448,7 @@ callback_manam (void) { Manam _tmp0_ = {0}; Manam* _tmp1_; - Manam* result = NULL; + Manam* result; _tmp0_.i = 23; _tmp0_.j = 42; _tmp1_ = _manam_dup0 (&_tmp0_); @@ -463,7 +463,7 @@ callback_manam2 (Manam* manam) Manam _tmp0_ = {0}; Manam* _tmp1_; Manam* _tmp2_; - Manam* result = NULL; + Manam* result; _tmp0_.i = 23; _tmp0_.j = 42; _tmp1_ = _manam_dup0 (&_tmp0_); diff --git a/tests/objects/class-new-no-override.c-expected b/tests/objects/class-new-no-override.c-expected index 370467a68..3952f8096 100644 --- a/tests/objects/class-new-no-override.c-expected +++ b/tests/objects/class-new-no-override.c-expected @@ -129,7 +129,7 @@ gchar* bar_foo (Bar* self) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (IS_BAR (self), NULL); _tmp0_ = g_strdup ("bar"); result = _tmp0_; diff --git a/tests/objects/classes-implicit-implementation.c-expected b/tests/objects/classes-implicit-implementation.c-expected index bbd01232f..865f7ca25 100644 --- a/tests/objects/classes-implicit-implementation.c-expected +++ b/tests/objects/classes-implicit-implementation.c-expected @@ -253,7 +253,7 @@ ibar_get_type (void) gint bar_foo (Bar* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_BAR (self), 0); g_assert_not_reached (); result = -1; @@ -311,7 +311,7 @@ bar_get_type (void) gint baz_foo (Baz* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_BAZ (self), 0); result = 23; return result; @@ -369,7 +369,7 @@ static gint foo_real_foo (IFoo* base) { Foo * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); result = 42; return result; diff --git a/tests/objects/classes-interfaces-virtuals.c-expected b/tests/objects/classes-interfaces-virtuals.c-expected index e277df490..03a625b22 100644 --- a/tests/objects/classes-interfaces-virtuals.c-expected +++ b/tests/objects/classes-interfaces-virtuals.c-expected @@ -209,7 +209,7 @@ ibar_get_type (void) static gint foo_real_ifoo_foo (Foo* self) { - gint result = 0; + gint result; result = 42; return result; } @@ -231,7 +231,7 @@ foo_real_ibar_foo (IBar* base) { Foo * self; gchar* _tmp0_; - gchar* result = NULL; + gchar* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); _tmp0_ = g_strdup ("foo"); result = _tmp0_; @@ -311,7 +311,7 @@ static gint bar_real_foo (Foo* base) { Bar * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); result = 23; return result; diff --git a/tests/objects/classes-interfaces.c-expected b/tests/objects/classes-interfaces.c-expected index 9cf514654..ebe228f54 100644 --- a/tests/objects/classes-interfaces.c-expected +++ b/tests/objects/classes-interfaces.c-expected @@ -262,7 +262,7 @@ static gint manam_real_ibar_foo (IBar* base) { Manam * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MANAM, Manam); result = 23; return result; @@ -273,7 +273,7 @@ manam_real_ifoo_foo (IFoo* base) { Manam * self; gchar* _tmp0_; - gchar* result = NULL; + gchar* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MANAM, Manam); _tmp0_ = g_strdup ("foo"); result = _tmp0_; diff --git a/tests/objects/compact-class-custom-ref.c-expected b/tests/objects/compact-class-custom-ref.c-expected index 37762f1df..db323d17a 100644 --- a/tests/objects/compact-class-custom-ref.c-expected +++ b/tests/objects/compact-class-custom-ref.c-expected @@ -35,7 +35,7 @@ static void _vala_main (void); Foo* foo_ref (Foo* self) { - Foo* result = NULL; + Foo* result; g_return_val_if_fail (self != NULL, NULL); g_atomic_int_inc ((volatile gint *) (&self->ref_count)); result = self; diff --git a/tests/objects/compact-class-destructor.c-expected b/tests/objects/compact-class-destructor.c-expected index 772e38a97..159804d6b 100644 --- a/tests/objects/compact-class-destructor.c-expected +++ b/tests/objects/compact-class-destructor.c-expected @@ -100,7 +100,7 @@ static void _vala_main (void); gint foo_destroy (Foo* self) { - gint result = 0; + gint result; g_return_val_if_fail (self != NULL, 0); g_slice_free1 ((gsize) sizeof (gint), self); result = 42; @@ -136,7 +136,7 @@ Foo* get_foo (void) { Foo* _tmp0_; - Foo* result = NULL; + Foo* result; _tmp0_ = foo_new (); result = _tmp0_; return result; diff --git a/tests/objects/gsource.c-expected b/tests/objects/gsource.c-expected index d711d8d86..3413e0726 100644 --- a/tests/objects/gsource.c-expected +++ b/tests/objects/gsource.c-expected @@ -55,7 +55,7 @@ foo_source_real_prepare (GSource* base, { FooSource * self; gint _vala_timeout = 0; - gboolean result = FALSE; + gboolean result; self = (FooSource*) base; _vala_timeout = 1000; result = FALSE; @@ -69,7 +69,7 @@ static gboolean foo_source_real_check (GSource* base) { FooSource * self; - gboolean result = FALSE; + gboolean result; self = (FooSource*) base; result = FALSE; return result; @@ -81,7 +81,7 @@ foo_source_real_dispatch (GSource* base, gpointer callback_target) { FooSource * self; - gboolean result = FALSE; + gboolean result; self = (FooSource*) base; result = FALSE; return result; @@ -126,7 +126,7 @@ bar_source_real_prepare (GSource* base, { BarSource * self; gint _vala_timeout = 0; - gboolean result = FALSE; + gboolean result; self = (BarSource*) base; _vala_timeout = self->custom_timeout; result = FALSE; @@ -140,7 +140,7 @@ static gboolean bar_source_real_check (GSource* base) { BarSource * self; - gboolean result = FALSE; + gboolean result; self = (BarSource*) base; result = FALSE; return result; @@ -152,7 +152,7 @@ bar_source_real_dispatch (GSource* base, gpointer callback_target) { BarSource * self; - gboolean result = FALSE; + gboolean result; self = (BarSource*) base; result = FALSE; return result; @@ -176,7 +176,7 @@ manam_source_real_dispatch (GSource* base, gpointer callback_target) { ManamSource * self; - gboolean result = FALSE; + gboolean result; self = (ManamSource*) base; result = FALSE; return result; diff --git a/tests/objects/interface-generics.c-expected b/tests/objects/interface-generics.c-expected index 92bfba197..c4ab829be 100644 --- a/tests/objects/interface-generics.c-expected +++ b/tests/objects/interface-generics.c-expected @@ -139,7 +139,7 @@ static gpointer foo_real_get (IFoo* base) { Foo * self; - gpointer result = NULL; + gpointer result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); result = NULL; return result; diff --git a/tests/objects/interface-property-base-access.c-expected b/tests/objects/interface-property-base-access.c-expected index 70a5f08a3..acd47da3b 100644 --- a/tests/objects/interface-property-base-access.c-expected +++ b/tests/objects/interface-property-base-access.c-expected @@ -547,7 +547,7 @@ foo_bar (Foo* self, { const gchar* _tmp0_; gchar* _tmp1_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (IS_FOO (self), NULL); g_return_val_if_fail (s != NULL, NULL); IFOO_GET_INTERFACE (self)->set_foo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BAR, Bar), TYPE_IFOO, IFoo), s); diff --git a/tests/objects/interface-virtual-override.c-expected b/tests/objects/interface-virtual-override.c-expected index 69868337c..626bcb248 100644 --- a/tests/objects/interface-virtual-override.c-expected +++ b/tests/objects/interface-virtual-override.c-expected @@ -249,7 +249,7 @@ static gint bar_real_foo (IFoo* base) { Bar * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); result = 42; return result; diff --git a/tests/objects/interfaces.c-expected b/tests/objects/interfaces.c-expected index d328b8d18..a5b7a72f5 100644 --- a/tests/objects/interfaces.c-expected +++ b/tests/objects/interfaces.c-expected @@ -301,7 +301,7 @@ maman_sub_baz_main_func (void) MamanIbaz* subbaz = NULL; MamanSubBaz* _tmp4_; FILE* _tmp5_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Interface Test: 1"); _tmp1_ = maman_baz_new (); diff --git a/tests/objects/member-initializer-chained.c-expected b/tests/objects/member-initializer-chained.c-expected index c4cb0f9dd..b458d8fd0 100644 --- a/tests/objects/member-initializer-chained.c-expected +++ b/tests/objects/member-initializer-chained.c-expected @@ -453,7 +453,7 @@ gint get_int (void) { gint _tmp0_; - gint result = 0; + gint result; _tmp0_ = i; i = _tmp0_ + 1; result = _tmp0_; diff --git a/tests/objects/methods.c-expected b/tests/objects/methods.c-expected index 51af592e8..9cf9e4ed7 100644 --- a/tests/objects/methods.c-expected +++ b/tests/objects/methods.c-expected @@ -613,7 +613,7 @@ maman_sub_bar_main (void) gint _tmp27__length1; gchar** _tmp28_; gint _tmp28__length1; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Inheritance Test: 1"); _tmp1_ = maman_sub_bar_new (); @@ -1118,7 +1118,7 @@ maman_base_access_ifoo_get_type (void) static gint maman_base_access_foo_real_virtual_method (MamanBaseAccessFoo* self) { - gint result = 0; + gint result; result = 1; return result; } @@ -1139,7 +1139,7 @@ static gint maman_base_access_foo_real_interface_method (MamanBaseAccessIFoo* base) { MamanBaseAccessFoo * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, MAMAN_BASE_ACCESS_TYPE_FOO, MamanBaseAccessFoo); result = 2; return result; @@ -1148,7 +1148,7 @@ maman_base_access_foo_real_interface_method (MamanBaseAccessIFoo* base) static gint maman_base_access_foo_real_virtual_interface_method (MamanBaseAccessFoo* self) { - gint result = 0; + gint result; result = 3; return result; } @@ -1230,7 +1230,7 @@ static gint maman_base_access_bar_real_virtual_method (MamanBaseAccessFoo* base) { MamanBaseAccessBar * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, MAMAN_BASE_ACCESS_TYPE_BAR, MamanBaseAccessBar); result = (MAMAN_BASE_ACCESS_FOO_CLASS (maman_base_access_bar_parent_class)->virtual_method (G_TYPE_CHECK_INSTANCE_CAST (self, MAMAN_BASE_ACCESS_TYPE_FOO, MamanBaseAccessFoo)) * 10) + 4; return result; @@ -1240,7 +1240,7 @@ static gint maman_base_access_bar_real_virtual_interface_method (MamanBaseAccessFoo* base) { MamanBaseAccessBar * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, MAMAN_BASE_ACCESS_TYPE_BAR, MamanBaseAccessBar); result = (MAMAN_BASE_ACCESS_FOO_CLASS (maman_base_access_bar_parent_class)->virtual_interface_method (G_TYPE_CHECK_INSTANCE_CAST (self, MAMAN_BASE_ACCESS_TYPE_FOO, MamanBaseAccessFoo)) * 10) + 5; return result; @@ -1300,7 +1300,7 @@ static gint maman_base_access_foo_bar_real_interface_method (MamanBaseAccessIFoo* base) { MamanBaseAccessFooBar * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, MAMAN_BASE_ACCESS_TYPE_FOO_BAR, MamanBaseAccessFooBar); result = (maman_base_access_foo_bar_maman_base_access_ifoo_parent_iface->interface_method (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, MAMAN_BASE_ACCESS_TYPE_FOO, MamanBaseAccessFoo), MAMAN_BASE_ACCESS_TYPE_IFOO, MamanBaseAccessIFoo)) * 10) + 6; return result; @@ -1310,7 +1310,7 @@ static gint maman_base_access_foo_bar_real_virtual_interface_method (MamanBaseAccessIFoo* base) { MamanBaseAccessFooBar * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, MAMAN_BASE_ACCESS_TYPE_FOO_BAR, MamanBaseAccessFooBar); result = -1; return result; diff --git a/tests/objects/plugin-module-init.c-expected b/tests/objects/plugin-module-init.c-expected index 48922e571..aeffdff2f 100644 --- a/tests/objects/plugin-module-init.c-expected +++ b/tests/objects/plugin-module-init.c-expected @@ -119,7 +119,7 @@ module_register_type (GTypeModule * module) GType init_plugin (GTypeModule* m) { - GType result = 0UL; + GType result; g_return_val_if_fail ((m == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (m, g_type_module_get_type ()), 0UL); module_register_type (m); result = TYPE_MODULE; diff --git a/tests/objects/properties.c-expected b/tests/objects/properties.c-expected index e4931d146..39dcbc1fa 100644 --- a/tests/objects/properties.c-expected +++ b/tests/objects/properties.c-expected @@ -828,7 +828,7 @@ sample_main (void) RealStruct* _tmp6_; RealStruct* _tmp7_; RealStruct* _tmp8_; - gint result = 0; + gint result; _tmp0_ = sample_new ("InitialName"); test = _tmp0_; sample_run (test); diff --git a/tests/objects/property-delegate.c-expected b/tests/objects/property-delegate.c-expected index 95a415a57..9daf7ca06 100644 --- a/tests/objects/property-delegate.c-expected +++ b/tests/objects/property-delegate.c-expected @@ -804,7 +804,7 @@ _vala_bar_set_property (GObject * object, const gchar* manam (void) { - const gchar* result = NULL; + const gchar* result; result = "manam"; return result; } diff --git a/tests/objects/property-real-struct-assignment.c-expected b/tests/objects/property-real-struct-assignment.c-expected index d1e3524ea..92a356436 100644 --- a/tests/objects/property-real-struct-assignment.c-expected +++ b/tests/objects/property-real-struct-assignment.c-expected @@ -208,7 +208,7 @@ get_foo (void) Foo _tmp2_; Foo* _tmp3_; Foo* _tmp4_; - Foo* result = NULL; + Foo* result; _tmp0_ = g_strdup ("foo"); _g_free0 (_tmp1_.s); _tmp1_.s = _tmp0_; diff --git a/tests/objects/regex.c-expected b/tests/objects/regex.c-expected index 073c7238e..f64c0349b 100644 --- a/tests/objects/regex.c-expected +++ b/tests/objects/regex.c-expected @@ -134,7 +134,7 @@ get_from_array (gint index) gint _tmp5_; GRegex* _tmp6_; GRegex* _tmp7_; - GRegex* result = NULL; + GRegex* result; _tmp0_ = _g_regex_ref0 (_thread_safe_regex_init (&_tmp_regex_0, "(\\d+\\.\\d+\\.\\d+)", 0)); _tmp1_ = _g_regex_ref0 (_thread_safe_regex_init (&_tmp_regex_1, "(\\d+)\\.\\d+\\.\\d+", 0)); _tmp2_ = _g_regex_ref0 (_thread_safe_regex_init (&_tmp_regex_2, "\\d+\\.(\\d+)\\.\\d+", 0)); @@ -160,7 +160,7 @@ GRegex* get_fixed (void) { GRegex* _tmp0_; - GRegex* result = NULL; + GRegex* result; _tmp0_ = _g_regex_ref0 (_thread_safe_regex_init (&_tmp_regex_4, "(is.*ip)", 0)); result = _tmp0_; return result; diff --git a/tests/objects/signals-delegate.c-expected b/tests/objects/signals-delegate.c-expected index 88f0a214a..0c860ee77 100644 --- a/tests/objects/signals-delegate.c-expected +++ b/tests/objects/signals-delegate.c-expected @@ -392,7 +392,7 @@ bar_instance_callback (Bar* self, const gchar* s) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (IS_BAR (self), NULL); g_return_val_if_fail (IS_FOO (foo), NULL); g_return_val_if_fail (s != NULL, NULL); @@ -457,7 +457,7 @@ callback_static (Foo* foo, const gchar* s) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (IS_FOO (foo), NULL); g_return_val_if_fail (s != NULL, NULL); _vala_assert (IS_FOO (foo), "foo is Foo"); diff --git a/tests/objects/signals-fundamental-return.c-expected b/tests/objects/signals-fundamental-return.c-expected index 290075d8f..f35928fd0 100644 --- a/tests/objects/signals-fundamental-return.c-expected +++ b/tests/objects/signals-fundamental-return.c-expected @@ -756,7 +756,7 @@ static Foo* __lambda4_ (void) { Foo* _tmp0_; - Foo* result = NULL; + Foo* result; _tmp0_ = foo_new (); result = _tmp0_; return result; @@ -775,7 +775,7 @@ static IBar* __lambda5_ (void) { Bar* _tmp0_; - IBar* result = NULL; + IBar* result; _tmp0_ = bar_new (); result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IBAR, IBar); return result; diff --git a/tests/objects/signals-generic-return.c-expected b/tests/objects/signals-generic-return.c-expected index ed3b2c67c..ab07d7489 100644 --- a/tests/objects/signals-generic-return.c-expected +++ b/tests/objects/signals-generic-return.c-expected @@ -297,7 +297,7 @@ _vala_foo_set_property (GObject * object, gint cb_foo (void) { - gint result = 0; + gint result; result = 23; return result; } @@ -306,7 +306,7 @@ gchar* cb_bar (void) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("foo"); result = _tmp0_; return result; @@ -315,7 +315,7 @@ cb_bar (void) static gint ___lambda4_ (void) { - gint result = 0; + gint result; result = 42; return result; } @@ -333,7 +333,7 @@ static gchar* ___lambda5_ (void) { gchar* _tmp0_; - gchar* result = NULL; + gchar* result; _tmp0_ = g_strdup ("bar"); result = _tmp0_; return result; diff --git a/tests/objects/signals-gobject-return.c-expected b/tests/objects/signals-gobject-return.c-expected index a056b3f01..b25d17cc9 100644 --- a/tests/objects/signals-gobject-return.c-expected +++ b/tests/objects/signals-gobject-return.c-expected @@ -206,7 +206,7 @@ static Foo* __lambda4_ (void) { Foo* _tmp0_; - Foo* result = NULL; + Foo* result; _tmp0_ = foo_new (); result = _tmp0_; return result; @@ -225,7 +225,7 @@ static IBar* __lambda5_ (void) { Foo* _tmp0_; - IBar* result = NULL; + IBar* result; _tmp0_ = foo_new (); result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IBAR, IBar); return result; diff --git a/tests/objects/signals-prototype-access.c-expected b/tests/objects/signals-prototype-access.c-expected index 63ddd5c0e..deb2050aa 100644 --- a/tests/objects/signals-prototype-access.c-expected +++ b/tests/objects/signals-prototype-access.c-expected @@ -126,7 +126,7 @@ foo_new (void) static gint foo_real_bar (Foo* self) { - gint result = 0; + gint result; result = 23; return result; } @@ -135,7 +135,7 @@ gint foo_bar (Foo* self) { gint _tmp0_ = 0; - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); g_signal_emit (self, foo_signals[FOO_BAR_SIGNAL], 0, &_tmp0_); result = _tmp0_; diff --git a/tests/objects/signals-struct-return.c-expected b/tests/objects/signals-struct-return.c-expected index b87e27883..bc3658882 100644 --- a/tests/objects/signals-struct-return.c-expected +++ b/tests/objects/signals-struct-return.c-expected @@ -365,7 +365,7 @@ ___lambda6_ (void) Foo _tmp2_; Foo* _tmp3_; Foo* _tmp4_; - Foo* result = NULL; + Foo* result; _tmp0_ = g_strdup ("bar"); _g_free0 (_tmp1_.s); _tmp1_.s = _tmp0_; @@ -395,7 +395,7 @@ ___lambda7_ (const gchar* s) Foo _tmp2_; Foo* _tmp3_; Foo* _tmp4_; - Foo* result = NULL; + Foo* result; g_return_val_if_fail (s != NULL, NULL); _vala_assert (g_strcmp0 (s, "bar") == 0, "s == \"bar\""); _tmp0_ = g_strdup ("bar"); diff --git a/tests/objects/signals.c-expected b/tests/objects/signals.c-expected index 66ce47005..f1b0e5356 100644 --- a/tests/objects/signals.c-expected +++ b/tests/objects/signals.c-expected @@ -822,7 +822,7 @@ __lambda6_ (MamanReturnBar* self, { FILE* _tmp0_; gint _tmp1_; - gint result = 0; + gint result; g_return_val_if_fail (MAMAN_IS_RETURN_FOO (foo), 0); _tmp0_ = stdout; fprintf (_tmp0_, " %d", arg); @@ -851,7 +851,7 @@ __lambda7_ (MamanReturnBar* self, FILE* _tmp0_; gint _tmp1_; gchar* _tmp2_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (MAMAN_IS_RETURN_FOO (foo), NULL); g_return_val_if_fail (arg != NULL, NULL); _tmp0_ = stdout; diff --git a/tests/objects/test-025.c-expected b/tests/objects/test-025.c-expected index 6218bdced..bc70aeb10 100644 --- a/tests/objects/test-025.c-expected +++ b/tests/objects/test-025.c-expected @@ -184,7 +184,7 @@ maman_sub_bar_main (void) MamanSubBar* bar = NULL; MamanSubBar* _tmp1_; FILE* _tmp2_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Base Access Test: 1"); _tmp1_ = maman_sub_bar_new (); diff --git a/tests/objects/test-026.c-expected b/tests/objects/test-026.c-expected index 32040897f..59a894bd3 100644 --- a/tests/objects/test-026.c-expected +++ b/tests/objects/test-026.c-expected @@ -170,7 +170,7 @@ maman_sub_bar_main (void) MamanSubBar* bar = NULL; MamanSubBar* _tmp1_; FILE* _tmp2_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Hidden Base Method Access Test: 1"); _tmp1_ = maman_sub_bar_new (); diff --git a/tests/objects/test-029.c-expected b/tests/objects/test-029.c-expected index f9be4cafd..86580b1b6 100644 --- a/tests/objects/test-029.c-expected +++ b/tests/objects/test-029.c-expected @@ -113,7 +113,7 @@ maman_foo_main (void) FILE* _tmp5_; gint _tmp6_; FILE* _tmp7_; - gint result = 0; + gint result; _tmp0_ = stdout; fprintf (_tmp0_, "Construct Formal Parameter Test: 1"); _tmp1_ = maman_foo_new (2, 3); diff --git a/tests/objects/type-narrowing-fallback.c-expected b/tests/objects/type-narrowing-fallback.c-expected index d8b2495c0..b7a0771ed 100644 --- a/tests/objects/type-narrowing-fallback.c-expected +++ b/tests/objects/type-narrowing-fallback.c-expected @@ -148,7 +148,7 @@ foo_get_type (void) gint bar_get_bar (Bar* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_BAR (self), 0); result = 23; return result; @@ -205,7 +205,7 @@ bar_get_type (void) static gint manam_real_get_foo (Manam* self) { - gint result = 0; + gint result; result = 42; return result; } diff --git a/tests/objects/with-expression.c-expected b/tests/objects/with-expression.c-expected index aedd1ee9d..fb310b26f 100644 --- a/tests/objects/with-expression.c-expected +++ b/tests/objects/with-expression.c-expected @@ -87,7 +87,7 @@ foo_factory (void) { gint _tmp0_; Foo* _tmp1_; - Foo* result = NULL; + Foo* result; _tmp0_ = foo_factory_called; foo_factory_called = _tmp0_ + 1; _tmp1_ = foo_new (); diff --git a/tests/objects/with-nested-in-lambda.c-expected b/tests/objects/with-nested-in-lambda.c-expected index 69ccd0bbf..a7af3ffcb 100644 --- a/tests/objects/with-nested-in-lambda.c-expected +++ b/tests/objects/with-nested-in-lambda.c-expected @@ -87,7 +87,7 @@ static void ___lambda4__foo_func (gpointer self); gint foo_bar (Foo* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); result = 23; return result; diff --git a/tests/objects/with-nested-method.c-expected b/tests/objects/with-nested-method.c-expected index ca1b1ba0c..22d990ca3 100644 --- a/tests/objects/with-nested-method.c-expected +++ b/tests/objects/with-nested-method.c-expected @@ -121,7 +121,7 @@ static void _vala_main (void); gint foo_foo (Foo* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); result = 23; return result; @@ -343,7 +343,7 @@ foo_unref (gpointer instance) gint bar_foo (Bar* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_BAR (self), 0); result = 42; return result; diff --git a/tests/objects/with-nested-signal.c-expected b/tests/objects/with-nested-signal.c-expected index c6bd27013..5f8d7f6f0 100644 --- a/tests/objects/with-nested-signal.c-expected +++ b/tests/objects/with-nested-signal.c-expected @@ -122,7 +122,7 @@ static void _______lambda5__foo_manam (Foo* _sender, static gint foo_real_foo (Foo* self) { - gint result = 0; + gint result; result = 23; return result; } @@ -358,7 +358,7 @@ static gint bar_real_foo (Foo* base) { Bar * self; - gint result = 0; + gint result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); result = 42; return result; diff --git a/tests/objects/with-nested-unambigous-signal.c-expected b/tests/objects/with-nested-unambigous-signal.c-expected index 9860a1a9a..a0366a8d3 100644 --- a/tests/objects/with-nested-unambigous-signal.c-expected +++ b/tests/objects/with-nested-unambigous-signal.c-expected @@ -89,7 +89,7 @@ static void _____lambda4__foo_manam (Foo* _sender, gint foo_bar (Foo* self) { - gint result = 0; + gint result; g_return_val_if_fail (IS_FOO (self), 0); result = 23; return result; diff --git a/tests/objects/with-nested.c-expected b/tests/objects/with-nested.c-expected index 596d60839..711ff201f 100644 --- a/tests/objects/with-nested.c-expected +++ b/tests/objects/with-nested.c-expected @@ -636,7 +636,7 @@ test_main (void) { Test* _tmp0_; Test* _tmp1_; - gint result = 0; + gint result; _tmp0_ = test_new (); _tmp1_ = _tmp0_; test_nested (_tmp1_); diff --git a/tests/ordering/delegate-class.c-expected b/tests/ordering/delegate-class.c-expected index c4ac1391c..d750f1928 100644 --- a/tests/ordering/delegate-class.c-expected +++ b/tests/ordering/delegate-class.c-expected @@ -71,7 +71,7 @@ Func foo_foo (Foo* self, Func p) { - Func result = NULL; + Func result; g_return_val_if_fail (IS_FOO (self), NULL); result = p; return result; diff --git a/tests/parser/template.c-expected b/tests/parser/template.c-expected index 1f3ff9477..933aa14f5 100644 --- a/tests/parser/template.c-expected +++ b/tests/parser/template.c-expected @@ -27,7 +27,7 @@ static void _vala_main (void); const gchar* m (void) { - const gchar* result = NULL; + const gchar* result; result = "foo"; return result; } @@ -35,7 +35,7 @@ m (void) static const gchar* string_to_string (const gchar* self) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (self != NULL, NULL); result = self; return result; diff --git a/tests/parser/with-embedded.c-expected b/tests/parser/with-embedded.c-expected index 3b8e82ead..d825c379f 100644 --- a/tests/parser/with-embedded.c-expected +++ b/tests/parser/with-embedded.c-expected @@ -16,7 +16,7 @@ static void _vala_main (void); static const gchar* string_to_string (const gchar* self) { - const gchar* result = NULL; + const gchar* result; g_return_val_if_fail (self != NULL, NULL); result = self; return result; diff --git a/tests/posix/arrays.c-expected b/tests/posix/arrays.c-expected index 7b76fb9d8..310fcbb0e 100644 --- a/tests/posix/arrays.c-expected +++ b/tests/posix/arrays.c-expected @@ -738,7 +738,7 @@ pass_helper (int* a, int* _tmp1_; int* _tmp2_; int _tmp2__length1; - int* result = NULL; + int* result; _tmp0_ = (a != NULL) ? _vala_array_dup8 (a, a_length1) : a; _tmp0__length1 = a_length1; _vala_b = (free (_vala_b), NULL); @@ -989,7 +989,7 @@ nd_array_pass (int* a, int _tmp6__length1; int _tmp6__length2; int _tmp6__length3; - int* result = NULL; + int* result; _tmp0_ = a_length1; assert (_tmp0_ == 2); _tmp1_ = a_length2; @@ -1157,7 +1157,7 @@ test_nd_array (void) int simple_func (void) { - int result = 0; + int result; result = 0; return result; } diff --git a/tests/posix/empty-length-0.c-expected b/tests/posix/empty-length-0.c-expected index a18289fc2..b11d450f3 100644 --- a/tests/posix/empty-length-0.c-expected +++ b/tests/posix/empty-length-0.c-expected @@ -132,7 +132,7 @@ get_foo (int* result_length1) int _tmp1__length1; char** _tmp2_; int _tmp2__length1; - char** result = NULL; + char** result; _tmp0_ = foo; _tmp0__length1 = foo_length1; _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup1 (_tmp0_, _tmp0__length1) : _tmp0_; @@ -168,7 +168,7 @@ get_bar (int* result_length1) int _tmp1__length1; int* _tmp2_; int _tmp2__length1; - int* result = NULL; + int* result; _tmp0_ = bar; _tmp0__length1 = bar_length1; _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : _tmp0_; @@ -211,7 +211,7 @@ get_manam (int* result_length1) int _tmp1__length1; Manam* _tmp2_; int _tmp2__length1; - Manam* result = NULL; + Manam* result; _tmp0_ = manam; _tmp0__length1 = manam_length1; _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : _tmp0_; diff --git a/tests/posix/string-concat.c-expected b/tests/posix/string-concat.c-expected index efb127088..5c9e3b301 100644 --- a/tests/posix/string-concat.c-expected +++ b/tests/posix/string-concat.c-expected @@ -24,7 +24,7 @@ static void _vala_main (void); const char* get_foo (void) { - const char* result = NULL; + const char* result; result = "foo"; return result; } diff --git a/tests/resolver/peek-inner-types.c-expected b/tests/resolver/peek-inner-types.c-expected index 3b471d8e2..4cf2d90d7 100644 --- a/tests/resolver/peek-inner-types.c-expected +++ b/tests/resolver/peek-inner-types.c-expected @@ -958,7 +958,7 @@ baz_ifoo_get_type (void) BazFooBar1* manam_foo1 (Manam* self) { - BazFooBar1* result = NULL; + BazFooBar1* result; g_return_val_if_fail (IS_MANAM (self), NULL); result = NULL; return result; @@ -967,7 +967,7 @@ manam_foo1 (Manam* self) BazFooIBar1* manam_ifoo1 (Manam* self) { - BazFooIBar1* result = NULL; + BazFooIBar1* result; g_return_val_if_fail (IS_MANAM (self), NULL); result = NULL; return result; @@ -976,7 +976,7 @@ manam_ifoo1 (Manam* self) BazIFooBar2* manam_foo2 (Manam* self) { - BazIFooBar2* result = NULL; + BazIFooBar2* result; g_return_val_if_fail (IS_MANAM (self), NULL); result = NULL; return result; @@ -985,7 +985,7 @@ manam_foo2 (Manam* self) BazIFooIBar2* manam_ifoo2 (Manam* self) { - BazIFooIBar2* result = NULL; + BazIFooIBar2* result; g_return_val_if_fail (IS_MANAM (self), NULL); result = NULL; return result; diff --git a/tests/semantic/class-opaque.c-expected b/tests/semantic/class-opaque.c-expected index 48718206e..0a1252961 100644 --- a/tests/semantic/class-opaque.c-expected +++ b/tests/semantic/class-opaque.c-expected @@ -45,7 +45,7 @@ foo_new (void) gint foo_get_i (Foo* self) { - gint result = 0; + gint result; g_return_val_if_fail (self != NULL, 0); result = self->i; return result; diff --git a/tests/semantic/floating-reference-base-method.c-expected b/tests/semantic/floating-reference-base-method.c-expected index 36f0b6a06..4d3d90528 100644 --- a/tests/semantic/floating-reference-base-method.c-expected +++ b/tests/semantic/floating-reference-base-method.c-expected @@ -218,7 +218,7 @@ static GInitiallyUnowned* foo_real_foo (IFoo* base) { Foo * self; - GInitiallyUnowned* result = NULL; + GInitiallyUnowned* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); result = NULL; return result; @@ -228,7 +228,7 @@ static GInitiallyUnowned* foo_real_bar (IBar* base) { Foo * self; - GInitiallyUnowned* result = NULL; + GInitiallyUnowned* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FOO, Foo); result = NULL; return result; @@ -237,7 +237,7 @@ foo_real_bar (IBar* base) static GInitiallyUnowned* foo_real_faz (Foo* self) { - GInitiallyUnowned* result = NULL; + GInitiallyUnowned* result; result = NULL; return result; } @@ -257,7 +257,7 @@ foo_faz (Foo* self) static GInitiallyUnowned* foo_real_baz (Foo* self) { - GInitiallyUnowned* result = NULL; + GInitiallyUnowned* result; result = NULL; return result; } @@ -513,7 +513,7 @@ static GInitiallyUnowned* manam_real_faz (Foo* base) { Manam * self; - GInitiallyUnowned* result = NULL; + GInitiallyUnowned* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MANAM, Manam); result = NULL; return result; @@ -523,7 +523,7 @@ static GInitiallyUnowned* manam_real_baz (Foo* base) { Manam * self; - GInitiallyUnowned* result = NULL; + GInitiallyUnowned* result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MANAM, Manam); result = NULL; return result; diff --git a/tests/semantic/floating-reference-error.c-expected b/tests/semantic/floating-reference-error.c-expected index 862e51930..5e582f5db 100644 --- a/tests/semantic/floating-reference-error.c-expected +++ b/tests/semantic/floating-reference-error.c-expected @@ -29,7 +29,7 @@ GVariant* get_floating_variant_with_error (GError** error) { GVariant* _tmp0_; - GVariant* result = NULL; + GVariant* result; _tmp0_ = g_variant_new_string ("bar"); result = _tmp0_; return result; diff --git a/tests/semantic/floating-reference.c-expected b/tests/semantic/floating-reference.c-expected index f15e34da0..685f20108 100644 --- a/tests/semantic/floating-reference.c-expected +++ b/tests/semantic/floating-reference.c-expected @@ -35,7 +35,7 @@ GVariant* get_floating_variant (void) { GVariant* _tmp0_; - GVariant* result = NULL; + GVariant* result; _tmp0_ = g_variant_new_string ("foo"); result = _tmp0_; return result; @@ -45,7 +45,7 @@ GVariant* get_floating_variant_with_error (GError** error) { GVariant* _tmp0_; - GVariant* result = NULL; + GVariant* result; _tmp0_ = g_variant_new_string ("bar"); result = _tmp0_; return result; diff --git a/tests/semantic/with-string.c-expected b/tests/semantic/with-string.c-expected index 461a6966e..7d80c4782 100644 --- a/tests/semantic/with-string.c-expected +++ b/tests/semantic/with-string.c-expected @@ -18,7 +18,7 @@ string_chomp (const gchar* self) { gchar* _result_ = NULL; gchar* _tmp0_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = g_strdup (self); _result_ = _tmp0_; diff --git a/tests/structs/bug657378.c-expected b/tests/structs/bug657378.c-expected index 43d1af6f2..2ab07075a 100644 --- a/tests/structs/bug657378.c-expected +++ b/tests/structs/bug657378.c-expected @@ -33,7 +33,7 @@ foo (const gchar* format, va_list _tmp0_ = {0}; gchar* _tmp1_; gchar* _tmp2_; - gchar* result = NULL; + gchar* result; g_return_val_if_fail (format != NULL, NULL); va_start (_tmp0_, format); _tmp1_ = g_strdup_vprintf (format, _tmp0_); diff --git a/tests/structs/cast-struct-boxed.c-expected b/tests/structs/cast-struct-boxed.c-expected index 049ad5bba..27102f8c1 100644 --- a/tests/structs/cast-struct-boxed.c-expected +++ b/tests/structs/cast-struct-boxed.c-expected @@ -107,7 +107,7 @@ foo_heap_owned (void) Foo* _tmp1_; Foo* _tmp2_; Foo* _tmp3_; - Foo* result = NULL; + Foo* result; _tmp0_.i = 23; _tmp1_ = _foo_dup0 (&_tmp0_); _foo_free0 (foo); @@ -124,7 +124,7 @@ foo_heap_unowned (void) Foo _tmp0_ = {0}; Foo* _tmp1_; Foo* _tmp2_; - Foo* result = NULL; + Foo* result; _tmp0_.i = 42; _tmp1_ = _foo_dup0 (&_tmp0_); _foo_free0 (foo); @@ -267,7 +267,7 @@ bar_heap_owned (void) Bar* _tmp3_; Bar* _tmp4_; Bar* _tmp5_; - Bar* result = NULL; + Bar* result; _tmp0_ = g_strdup ("bar"); _g_free0 (_tmp1_.s); _tmp1_.s = _tmp0_; @@ -290,7 +290,7 @@ bar_heap_unowned (void) Bar _tmp2_; Bar* _tmp3_; Bar* _tmp4_; - Bar* result = NULL; + Bar* result; _tmp0_ = g_strdup ("manam"); _g_free0 (_tmp1_.s); _tmp1_.s = _tmp0_; diff --git a/tests/structs/gvalue-implicit-comparison.c-expected b/tests/structs/gvalue-implicit-comparison.c-expected index 2d8605953..21d2e91bb 100644 --- a/tests/structs/gvalue-implicit-comparison.c-expected +++ b/tests/structs/gvalue-implicit-comparison.c-expected @@ -61,7 +61,7 @@ GValue* get_nullable_value (GValue* v) { GValue* _tmp0_; - GValue* result = NULL; + GValue* result; _tmp0_ = __g_value_dup0 (v); result = _tmp0_; return result; diff --git a/tests/structs/gvalue.c-expected b/tests/structs/gvalue.c-expected index 0caf6e916..b6139ec2d 100644 --- a/tests/structs/gvalue.c-expected +++ b/tests/structs/gvalue.c-expected @@ -1016,7 +1016,7 @@ take_value (GValue* v) gboolean make_bool (void) { - gboolean result = FALSE; + gboolean result; result = TRUE; return result; } diff --git a/tests/structs/simple-type-default-value.c-expected b/tests/structs/simple-type-default-value.c-expected index a9a58bbab..c7bc26b22 100644 --- a/tests/structs/simple-type-default-value.c-expected +++ b/tests/structs/simple-type-default-value.c-expected @@ -31,7 +31,7 @@ Foo bar (GObject* o) { Foo _tmp0_ = (Foo) { .i = 23 }; - Foo result = (Foo) { .i = 23 }; + Foo result; g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT), (Foo) { .i = 23 }); result = _tmp0_; return result; |