From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 6 Mar 2012 12:27:19 +0000 (+0100)
Subject: posix: Fix several string functions
X-Git-Tag: 0.16.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40590c4d54b190fcb8e400f6f79de75875ff5ddd;p=thirdparty%2Fvala.git

posix: Fix several string functions

Fixes bug 671309.
---

diff --git a/vapi/posix.vapi b/vapi/posix.vapi
index 28b92d91a..3603a0cc7 100644
--- a/vapi/posix.vapi
+++ b/vapi/posix.vapi
@@ -1194,7 +1194,7 @@ namespace Posix {
 	[CCode (cheader_filename = "string.h")]
 	public unowned string strcat (string s1, string s2);
 	[CCode (cheader_filename = "string.h")]
-	public unowned string strchr (string s, int c);
+	public unowned string? strchr (string s, int c);
 	[CCode (cheader_filename = "string.h")]
 	public int strcmp (string s1, string s2);
 	[CCode (cheader_filename = "string.h")]
@@ -1204,7 +1204,7 @@ namespace Posix {
 	[CCode (cheader_filename = "string.h")]
 	public size_t strcspn (string s1, string s2);
 	[CCode (cheader_filename = "string.h")]
-	public unowned string strdup (string s1);
+	public string strdup (string s1);
 	[CCode (cheader_filename = "string.h")]
 	public unowned string strerror (int errnum);
 	[CCode (cheader_filename = "string.h")]
@@ -1218,17 +1218,17 @@ namespace Posix {
 	[CCode (cheader_filename = "string.h")]
 	public unowned string strncpy (string s1, string s2, size_t n);
 	[CCode (cheader_filename = "string.h")]
-	public unowned string strpbrk (string s1, string s2);
+	public unowned string? strpbrk (string s1, string s2);
 	[CCode (cheader_filename = "string.h")]
-	public unowned string strrchr (string s, int c);
+	public unowned string? strrchr (string s, int c);
 	[CCode (cheader_filename = "string.h")]
 	public size_t strspn (string s1, string s2);
 	[CCode (cheader_filename = "string.h")]
-	public unowned string strstr (string s1, string s2);
+	public unowned string? strstr (string s1, string s2);
 	[CCode (cheader_filename = "string.h")]
-	public unowned string strtok (string s1, string s2);
+	public unowned string? strtok (string s1, string s2);
 	[CCode (cheader_filename = "string.h")]
-	public unowned string strtok_r (string s, string sep, out string lasts);
+	public unowned string? strtok_r (string? s, string sep, out unowned string lasts);
 	[CCode (cheader_filename = "string.h")]
 	public size_t strxfrm (string s1, string s2, size_t n);