Actually use printf-like way of Report.*()

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index ff0ee3f94edfdae48d858c14b0eb60984558f9ab..c2eefe02c5bfeff0bd1816c89ae6d227f858c565 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -380,7 +380,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
        protected CCodeBaseModule () {
                if (Vala.get_build_version () != Vala.BUILD_VERSION) {
-                       Report.error (null, "Integrity check failed (libvala %s doesn't match ccodegen %s)".printf (Vala.get_build_version (), Vala.BUILD_VERSION));
+                       Report.error (null, "Integrity check failed (libvala %s doesn't match ccodegen %s)", Vala.get_build_version (), Vala.BUILD_VERSION);
                }
 
                predefined_marshal_set = new HashSet<string> (str_hash, str_equal);

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index 115d4ff98d8fc50666cd743a4ef9d5b3d11b12ad..f7c37d735ce03aa2b9f9b5fc7f225794ac0ff868 100644 (file)
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -357,7 +357,7 @@ public class Vala.GIRWriter : CodeVisitor {
                var old_gir_version = ns.get_attribute_string ("CCode", "gir_version");
                if ((old_gir_namespace != null && old_gir_namespace != gir_namespace)
                    || (old_gir_version != null && old_gir_version != gir_version)) {
-                       Report.warning (ns.source_reference, "Replace conflicting CCode.gir_* attributes for namespace `%s'".printf (ns.name));
+                       Report.warning (ns.source_reference, "Replace conflicting CCode.gir_* attributes for namespace `%s'", ns.name);
                }
                ns.set_attribute_string ("CCode", "gir_namespace", gir_namespace);
                ns.set_attribute_string ("CCode", "gir_version", gir_version);

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 23b1e7db438bd87c2a61b10054a82d0ae086dbe2..a5d33895676d4ca7a4162ec3d545324efe745a36 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -3046,19 +3046,19 @@ public class Vala.Parser : CodeVisitor {
                }
                if (old_cl != null && old_cl.is_partial) {
                        if (cl.is_partial != old_cl.is_partial) {
-                               Report.error (cl.source_reference, "conflicting partial and not partial declarations of `%s'".printf (cl.name));
+                               Report.error (cl.source_reference, "conflicting partial and not partial declarations of `%s'", cl.name);
                                cl.error = true;
                        }
                        if (cl.access != old_cl.access) {
-                               Report.error (cl.source_reference, "partial declarations of `%s' have conflicting accessiblity modifiers".printf (cl.name));
+                               Report.error (cl.source_reference, "partial declarations of `%s' have conflicting accessiblity modifiers", cl.name);
                                cl.error = true;
                        }
                        if (cl.is_abstract != old_cl.is_abstract) {
-                               Report.error (cl.source_reference, "partial declarations of `%s' have conflicting abstract modifiers".printf (cl.name));
+                               Report.error (cl.source_reference, "partial declarations of `%s' have conflicting abstract modifiers", cl.name);
                                cl.error = true;
                        }
                        if (cl.is_sealed != old_cl.is_sealed) {
-                               Report.error (cl.source_reference, "partial declarations of `%s' have conflicting sealed modifiers".printf (cl.name));
+                               Report.error (cl.source_reference, "partial declarations of `%s' have conflicting sealed modifiers", cl.name);
                                cl.error = true;
                        }
                        if (cl.error) {