From: Geert Jordaens <geert.jordaens@telenet.be>
Date: Wed, 4 Aug 2010 18:33:02 +0000 (-0700)
Subject: glib-2.0: Use GLib FORMAT where possible to fix format warnings
X-Git-Tag: 0.9.5~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e87cb2aa84c8981b051507899c704c9f63b64c6f;p=thirdparty%2Fvala.git

glib-2.0: Use GLib FORMAT where possible to fix format warnings

Fixes bug #618404.
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 016026381..0ab76d61c 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -272,7 +272,7 @@ public struct size_t {
 	public const string FORMAT_MODIFIER;
 
 	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
-	public string to_string (string format = "%zu");
+	public string to_string (string format = "%" + FORMAT);
 
 	[CCode (cname = "GSIZE_TO_POINTER")]
 	public void* to_pointer ();
@@ -300,7 +300,7 @@ public struct ssize_t {
 	public const string FORMAT_MODIFIER;
 
 	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
-	public string to_string (string format = "%zi");
+	public string to_string (string format = "%" + FORMAT);
 
 	[CCode (cname = "MIN")]
 	public static ssize_t min (ssize_t a, ssize_t b);
@@ -365,7 +365,7 @@ public struct int16 {
 	public const string FORMAT_MODIFIER;
 
 	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
-	public string to_string (string format = "%hi");
+	public string to_string (string format = "%" + FORMAT);
 
 	[CCode (cname = "MIN")]
 	public static int16 min (int16 a, int16 b);
@@ -519,7 +519,7 @@ public struct int64 {
 	public const string FORMAT_MODIFIER;
 
 	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
-	public string to_string (string format = "%lli");
+	public string to_string (string format = "%" + FORMAT);
 
 	[CCode (cname = "MIN")]
 	public static int64 min (int64 a, int64 b);
@@ -559,7 +559,7 @@ public struct uint64 {
 	public const string FORMAT_MODIFIER;
 
 	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
-	public string to_string (string format = "%llu");
+	public string to_string (string format = "%" + FORMAT);
 
 	[CCode (cname = "MIN")]
 	public static uint64 min (uint64 a, uint64 b);