From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 20 Nov 2022 09:35:36 +0000 (+0100)
Subject: Actually use printf-like way of Report.*()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a16275e1353a782d7f16c1abdedeb17d785ddaa9;p=thirdparty%2Fvala.git

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

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index ff0ee3f94..c2eefe02c 100644
--- 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 115d4ff98..f7c37d735 100644
--- 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 23b1e7db4..a5d338956 100644
--- 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) {