From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 2 Jun 2018 15:20:24 +0000 (+0200)
Subject: glib-2.0: Do not mark simple-type out-parameters as nullable
X-Git-Tag: 0.41.90~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea539e905cb07632a045c4457dfa81d1db4c806f;p=thirdparty%2Fvala.git

glib-2.0: Do not mark simple-type out-parameters as nullable

Fixes g_utf8_*, g_ucs4_* and g_utf16_ bindings which were introduced with
5c5245d1ca3616c0d4f861efff07418ddc67e294

Fixes https://gitlab.gnome.org/GNOME/vala/issues/634
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index ed31ce758..78a8b9cde 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1458,11 +1458,11 @@ public class string {
 	}
 
 	[CCode (cname = "g_utf8_to_utf16")]
-	public string16 to_utf16 (long len = -1, out long? items_read = null, out long? items_written = null) throws GLib.ConvertError;
+	public string16 to_utf16 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
 	[CCode (cname = "g_utf8_to_ucs4")]
-	public string32 to_utf32 (long len = -1, out long? items_read = null, out long? items_written = null) throws GLib.ConvertError;
+	public string32 to_utf32 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
 	[CCode (cname = "g_utf8_to_ucs4_fast")]
-	public string32 to_utf32_fast (long len = -1, out long? items_written = null);
+	public string32 to_utf32_fast (long len = -1, out long items_written = null);
 
 }
 
@@ -1472,9 +1472,9 @@ public class string {
 [CCode (cname = "gunichar", const_cname = "const gunichar", free_function = "g_free", cheader_filename = "glib.h")]
 public class string32 {
 	[CCode (cname = "g_ucs4_to_utf16")]
-	public string16 to_utf16 (long len = -1, out long? items_read = null, out long? items_written = null) throws GLib.ConvertError;
+	public string16 to_utf16 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
 	[CCode (cname = "g_ucs4_to_utf8")]
-	public string to_utf8 (long len = -1, out long? items_read = null, out long? items_written = null) throws GLib.ConvertError;
+	public string to_utf8 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
 
 	public string? to_string () {
 		try {
@@ -1491,9 +1491,9 @@ public class string32 {
 [CCode (cname = "gunichar2", const_cname = "const gunichar2", free_function = "g_free", cheader_filename = "glib.h")]
 public class string16 {
 	[CCode (cname = "g_utf16_to_ucs4")]
-	public string32 to_utf32 (long len = -1, out long? items_read = null, out long? items_written = null) throws GLib.ConvertError;
+	public string32 to_utf32 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
 	[CCode (cname = "g_utf16_to_utf8")]
-	public string to_utf8 (long len = -1, out long? items_read = null, out long? items_written = null) throws GLib.ConvertError;
+	public string to_utf8 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
 
 	public string? to_string () {
 		try {