codegen: Add missing data parameter to GTypeInfo callbacks

Found by -Werror=cast-function-type

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index a2628a78372590eecae070856df9dac73c35cae8..9086268e818876c848b1f3ad1136b0b3cbb26a31 100644 (file)
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -880,6 +880,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                if (m is CreationMethod && m.parent_symbol is Class && ((current_class.is_compact && current_class.base_class != null) || current_class.base_class == gsource_type)) {
                        var cinitcall = new CCodeFunctionCall (new CCodeIdentifier ("%s_instance_init".printf (get_ccode_lower_case_name (current_class, null))));
                        cinitcall.add_argument (get_this_cexpression ());
+                       cinitcall.add_argument (new CCodeConstant ("NULL"));
                        ccode.add_expression (cinitcall);
                }
        }

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 8d75c5dd6b26da46535edc4e0f66ecd1440ad023..fef66ef328aff83f0a681ea9a254b34bf767a500 100644 (file)
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -661,6 +661,7 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
                                                if (cl.base_class == null) {
                                                        var cinitcall = new CCodeFunctionCall (new CCodeIdentifier ("%s_instance_init".printf (get_ccode_lower_case_name (cl, null))));
                                                        cinitcall.add_argument (get_this_cexpression ());
+                                                       cinitcall.add_argument (new CCodeConstant ("NULL"));
                                                        ccode.add_expression (cinitcall);
                                                }
                                        } else {

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 2fe134a795cd16613ec0e83e5d2322e6669dcbbc..bf5ab237d2c710098dcadc6190e1ad09d09bee65 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1264,6 +1264,7 @@ public class Vala.GTypeModule : GErrorModule {
 
                var func = new CCodeFunction ("%s_class_init".printf (get_ccode_lower_case_name (cl, null)));
                func.add_parameter (new CCodeParameter ("klass", "%sClass *".printf (get_ccode_name (cl))));
+               func.add_parameter (new CCodeParameter ("klass_data", "gpointer"));
                func.modifiers = CCodeModifiers.STATIC;
 
                CCodeFunctionCall ccall;
@@ -1400,6 +1401,7 @@ public class Vala.GTypeModule : GErrorModule {
        private void add_interface_init_function (Class cl, Interface iface) {
                var iface_init = new CCodeFunction ("%s_%s_interface_init".printf (get_ccode_lower_case_name (cl), get_ccode_lower_case_name (iface)), "void");
                iface_init.add_parameter (new CCodeParameter ("iface", "%s *".printf (get_ccode_type_name (iface))));
+               iface_init.add_parameter (new CCodeParameter ("iface_data", "gpointer"));
                iface_init.modifiers = CCodeModifiers.STATIC;
 
                push_function (iface_init);
@@ -1635,6 +1637,7 @@ public class Vala.GTypeModule : GErrorModule {
 
                var func = new CCodeFunction ("%s_instance_init".printf (get_ccode_lower_case_name (cl, null)));
                func.add_parameter (new CCodeParameter ("self", "%s *".printf (get_ccode_name (cl))));
+               func.add_parameter (new CCodeParameter ("klass", "gpointer"));
                func.modifiers = CCodeModifiers.STATIC;
 
                push_function (func);
@@ -1736,6 +1739,7 @@ public class Vala.GTypeModule : GErrorModule {
                function.modifiers = CCodeModifiers.STATIC;
 
                function.add_parameter (new CCodeParameter ("klass", "%sClass *".printf (get_ccode_name (cl))));
+               function.add_parameter (new CCodeParameter ("klass_data", "gpointer"));
 
                push_function (function);
 
@@ -2261,6 +2265,7 @@ public class Vala.GTypeModule : GErrorModule {
 
                var default_init = new CCodeFunction ("%s_default_init".printf (get_ccode_lower_case_name (iface, null)), "void");
                default_init.add_parameter (new CCodeParameter ("iface", "%sIface *".printf (get_ccode_name (iface))));
+               default_init.add_parameter (new CCodeParameter ("iface_data", "gpointer"));
                default_init.modifiers = CCodeModifiers.STATIC;
 
                push_function (default_init);