From 588a164f0f4350a07383032d7ad2a91a15271791 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 14 Mar 2024 10:41:24 +0100 Subject: [PATCH] codegen: Add missing initializers for private fields of GSourceFuncs Found by -Werror=missing-field-initializers --- codegen/valaccodemethodcallmodule.vala | 2 +- tests/objects/gsource.c-expected | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala index 95087b535..1368d3c3d 100644 --- a/codegen/valaccodemethodcallmodule.vala +++ b/codegen/valaccodemethodcallmodule.vala @@ -222,7 +222,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule { var funcs = new CCodeDeclaration ("const GSourceFuncs"); funcs.modifiers = CCodeModifiers.STATIC; - funcs.add_declarator (new CCodeVariableDeclarator ("_source_funcs", new CCodeConstant ("{ %s, %s, %s_real_dispatch, %s_finalize}".printf (prepare_func, check_func, class_prefix, class_prefix)))); + funcs.add_declarator (new CCodeVariableDeclarator ("_source_funcs", new CCodeConstant ("{ %s, %s, %s_real_dispatch, %s_finalize, NULL, NULL}".printf (prepare_func, check_func, class_prefix, class_prefix)))); ccode.add_statement (funcs); ccall.add_argument (new CCodeCastExpression (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_source_funcs")), "GSourceFuncs *")); diff --git a/tests/objects/gsource.c-expected b/tests/objects/gsource.c-expected index c6cc94f7b..67e2f30fb 100644 --- a/tests/objects/gsource.c-expected +++ b/tests/objects/gsource.c-expected @@ -99,7 +99,7 @@ FooSource* foo_source_new (void) { FooSource* self; - static const GSourceFuncs _source_funcs = { foo_source_real_prepare, foo_source_real_check, foo_source_real_dispatch, foo_source_finalize}; + static const GSourceFuncs _source_funcs = { foo_source_real_prepare, foo_source_real_check, foo_source_real_dispatch, foo_source_finalize, NULL, NULL}; self = (FooSource*) g_source_new ((GSourceFuncs *) (&_source_funcs), sizeof (FooSource)); foo_source_instance_init (self); return self; @@ -121,7 +121,7 @@ BarSource* bar_source_new (gint timeout) { BarSource* self; - static const GSourceFuncs _source_funcs = { bar_source_real_prepare, bar_source_real_check, bar_source_real_dispatch, bar_source_finalize}; + static const GSourceFuncs _source_funcs = { bar_source_real_prepare, bar_source_real_check, bar_source_real_dispatch, bar_source_finalize, NULL, NULL}; self = (BarSource*) g_source_new ((GSourceFuncs *) (&_source_funcs), sizeof (BarSource)); bar_source_instance_init (self); self->custom_timeout = timeout; @@ -194,7 +194,7 @@ ManamSource* manam_source_new (void) { ManamSource* self; - static const GSourceFuncs _source_funcs = { NULL, NULL, manam_source_real_dispatch, manam_source_finalize}; + static const GSourceFuncs _source_funcs = { NULL, NULL, manam_source_real_dispatch, manam_source_finalize, NULL, NULL}; self = (ManamSource*) g_source_new ((GSourceFuncs *) (&_source_funcs), sizeof (ManamSource)); manam_source_instance_init (self); return self; -- 2.47.3