From: Evan Nemerson <evan@polussystems.com>
Date: Wed, 8 Jul 2009 19:26:23 +0000 (-0700)
Subject: Use (s)size_t instead of (u)long in several string methods
X-Git-Tag: 0.7.5~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0378304718afee5892e779df537a30bedf818206;p=thirdparty%2Fvala.git

Use (s)size_t instead of (u)long in several string methods

Fixes bug 577352.
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index c7eb75dcb..bf93095ca 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -837,7 +837,7 @@ public class string {
 	[CCode (cname = "g_strjoin")]
 	public static string join (string separator, ...);
 	[CCode (cname = "g_strnfill")]
-	public static string nfill (ulong length, char fill_char);
+	public static string nfill (size_t length, char fill_char);
 
 	[CCode (cname = "g_utf8_next_char")]
 	public weak string next_char ();
@@ -853,29 +853,29 @@ public class string {
 	[CCode (cname = "g_utf8_prev_char")]
 	public weak string prev_char ();
 	[CCode (cname = "g_utf8_strlen")]
-	public long len (long max = -1);
+	public long len (ssize_t max = -1);
 	[CCode (cname = "g_utf8_strchr")]
-	public weak string chr (long len, unichar c);
+	public weak string chr (ssize_t len, unichar c);
 	[CCode (cname = "g_utf8_strrchr")]
-	public weak string rchr (long len, unichar c);
+	public weak string rchr (ssize_t len, unichar c);
 	[CCode (cname = "g_utf8_strreverse")]
-	public string reverse (int len = -1);
+	public string reverse (ssize_t len = -1);
 	[CCode (cname = "g_utf8_validate")]
-	public bool validate (long max_len = -1, out string end = null);
+	public bool validate (ssize_t max_len = -1, out string end = null);
 	[CCode (cname = "g_utf8_normalize")]
-	public string normalize (long len = -1, NormalizeMode mode = NormalizeMode.DEFAULT);
+	public string normalize (ssize_t len = -1, NormalizeMode mode = NormalizeMode.DEFAULT);
 	
 	[CCode (cname = "g_utf8_strup")]
-	public string up (long len = -1);
+	public string up (ssize_t len = -1);
 	[CCode (cname = "g_utf8_strdown")]
-	public string down (long len = -1);
+	public string down (ssize_t len = -1);
 	[CCode (cname = "g_utf8_casefold")]
-	public string casefold (long len = -1);
+	public string casefold (ssize_t len = -1);
 	[CCode (cname = "g_utf8_collate")]
 	public int collate (string str2);
 
 	[CCode (cname = "g_locale_to_utf8")]
-	public string locale_to_utf8 (long len, out ulong bytes_read, out ulong bytes_written, out GLib.Error error = null);
+	public string locale_to_utf8 (ssize_t len, out size_t bytes_read, out size_t bytes_written, out GLib.Error error = null);
   
 	[CCode (cname = "g_strchomp")]
 	public weak string chomp();
@@ -906,7 +906,7 @@ public class string {
 	}
 
 	[CCode (cname = "strlen")]
-	public long size ();
+	public size_t size ();
 
 	[CCode (cname = "g_utf8_skip")]
 	public static char[] skip;
diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index bad2e099c..b4426ea66 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -840,7 +840,7 @@ public class Vala.GIdlParser : CodeVisitor {
 				}
 			}
 			while (common_prefix.len () > 0 && (!common_prefix.has_suffix ("_") ||
-			       (value.name.offset (common_prefix.size ()).get_char ().isdigit ()) && (value.name.len () - common_prefix.len ()) <= 1)) {
+			       (value.name.offset (common_prefix.length).get_char ().isdigit ()) && (value.name.len () - common_prefix.len ()) <= 1)) {
 				// enum values may not consist solely of digits
 				common_prefix = common_prefix.ndup (common_prefix.size () - 1);
 			}
diff --git a/vapigen/valagirparser.vala b/vapigen/valagirparser.vala
index 650c414f3..1e4812096 100644
--- a/vapigen/valagirparser.vala
+++ b/vapigen/valagirparser.vala
@@ -302,7 +302,7 @@ public class Vala.GirParser : CodeVisitor {
 					}
 				}
 				while (common_prefix.len () > 0 && (!common_prefix.has_suffix ("_") ||
-				       (cname.offset (common_prefix.size ()).get_char ().isdigit ()) && (cname.len () - common_prefix.len ()) <= 1)) {
+				       (cname.offset (common_prefix.length).get_char ().isdigit ()) && (cname.len () - common_prefix.len ()) <= 1)) {
 					// enum values may not consist solely of digits
 					common_prefix = common_prefix.ndup (common_prefix.size () - 1);
 				}