]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
gdbus: Properly set annotations field of GDBus*Info struct to NULL
authorRico Tzschichholz <ricotz@ubuntu.com>
Sat, 5 Jan 2019 20:41:20 +0000 (21:41 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Thu, 10 Jan 2019 20:56:03 +0000 (21:56 +0100)
Found by -Werror=missing-field-initializers

codegen/valagdbusmodule.vala

index 8acb28259e72fe3fd4032cf9ed05a1d7ecd0f654..c6289ebf17df55d46ae09f364bac5f1f84453a9b 100644 (file)
@@ -287,6 +287,7 @@ public class Vala.GDBusModule : GVariantModule {
                                info.append (new CCodeConstant ("-1"));
                                info.append (new CCodeConstant ("\"%s\"".printf (param.name)));
                                info.append (new CCodeConstant ("\"%s\"".printf (get_type_signature (param.variable_type, param))));
+                               info.append (new CCodeConstant ("NULL"));
 
                                var cdecl = new CCodeDeclaration ("const GDBusArgInfo");
                                cdecl.add_declarator (new CCodeVariableDeclarator ("_" + get_ccode_lower_case_prefix (sym) + "dbus_arg_info_" + m.name + "_" + param.name, info));
@@ -305,6 +306,7 @@ public class Vala.GDBusModule : GVariantModule {
                                info.append (new CCodeConstant ("-1"));
                                info.append (new CCodeConstant ("\"%s\"".printf (dbus_result_name (m))));
                                info.append (new CCodeConstant ("\"%s\"".printf (get_type_signature (m.return_type, m))));
+                               info.append (new CCodeConstant ("NULL"));
 
                                var cdecl = new CCodeDeclaration ("const GDBusArgInfo");
                                cdecl.add_declarator (new CCodeVariableDeclarator ("_" + get_ccode_lower_case_prefix (sym) + "dbus_arg_info_" + m.name + "_result", info));
@@ -332,6 +334,7 @@ public class Vala.GDBusModule : GVariantModule {
                        info.append (new CCodeConstant ("\"%s\"".printf (get_dbus_name_for_member (m))));
                        info.append (new CCodeCastExpression (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_" + get_ccode_lower_case_prefix (sym) + "dbus_arg_info_" + m.name + "_in")), "GDBusArgInfo **"));
                        info.append (new CCodeCastExpression (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_" + get_ccode_lower_case_prefix (sym) + "dbus_arg_info_" + m.name + "_out")), "GDBusArgInfo **"));
+                       info.append (new CCodeConstant ("NULL"));
 
                        cdecl = new CCodeDeclaration ("const GDBusMethodInfo");
                        cdecl.add_declarator (new CCodeVariableDeclarator ("_" + get_ccode_lower_case_prefix (sym) + "dbus_method_info_" + m.name, info));
@@ -369,6 +372,7 @@ public class Vala.GDBusModule : GVariantModule {
                                info.append (new CCodeConstant ("-1"));
                                info.append (new CCodeConstant ("\"%s\"".printf (param.name)));
                                info.append (new CCodeConstant ("\"%s\"".printf (get_type_signature (param.variable_type, param))));
+                               info.append (new CCodeConstant ("NULL"));
 
                                var cdecl = new CCodeDeclaration ("const GDBusArgInfo");
                                cdecl.add_declarator (new CCodeVariableDeclarator ("_" + get_ccode_lower_case_prefix (sym) + "dbus_arg_info_" + get_ccode_lower_case_name (sig) + "_" + param.name, info));
@@ -389,6 +393,7 @@ public class Vala.GDBusModule : GVariantModule {
                        info.append (new CCodeConstant ("-1"));
                        info.append (new CCodeConstant ("\"%s\"".printf (get_dbus_name_for_member (sig))));
                        info.append (new CCodeCastExpression (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_" + get_ccode_lower_case_prefix (sym) + "dbus_arg_info_" + get_ccode_lower_case_name (sig))), "GDBusArgInfo **"));
+                       info.append (new CCodeConstant ("NULL"));
 
                        cdecl = new CCodeDeclaration ("const GDBusSignalInfo");
                        cdecl.add_declarator (new CCodeVariableDeclarator ("_" + get_ccode_lower_case_prefix (sym) + "dbus_signal_info_" + get_ccode_lower_case_name (sig), info));
@@ -433,6 +438,7 @@ public class Vala.GDBusModule : GVariantModule {
                        } else {
                                info.append (new CCodeConstant ("G_DBUS_PROPERTY_INFO_FLAGS_NONE"));
                        }
+                       info.append (new CCodeConstant ("NULL"));
 
                        var cdecl = new CCodeDeclaration ("const GDBusPropertyInfo");
                        cdecl.add_declarator (new CCodeVariableDeclarator ("_" + get_ccode_lower_case_prefix (sym) + "dbus_property_info_" + prop.name, info));
@@ -459,6 +465,7 @@ public class Vala.GDBusModule : GVariantModule {
                info.append (new CCodeCastExpression (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_method_info (sym)), "GDBusMethodInfo **"));
                info.append (new CCodeCastExpression (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_signal_info (sym)), "GDBusSignalInfo **"));
                info.append (new CCodeCastExpression (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_property_info (sym)), "GDBusPropertyInfo **"));
+               info.append (new CCodeConstant ("NULL"));
 
                var cdecl = new CCodeDeclaration ("const GDBusInterfaceInfo");
                cdecl.add_declarator (new CCodeVariableDeclarator ("_" + get_ccode_lower_case_prefix (sym) + "dbus_interface_info", info));