vala r2253 - in trunk: . vapi

[juergbi svn gnome org]

Author: juergbi
Date: Thu Jan  1 22:49:38 2009
New Revision: 2253
URL: http://svn.gnome.org/viewvc/vala?rev=2253&view=rev

Log:
2009-01-01  JÃrg Billeter  <j bitron ch>

	* vapi/glib-2.0.vapi:

	Do not use g_warn_if_fail to not require glib 2.16


Modified:
   trunk/ChangeLog
   trunk/vapi/glib-2.0.vapi

Modified: trunk/vapi/glib-2.0.vapi
==============================================================================
--- trunk/vapi/glib-2.0.vapi	(original)
+++ trunk/vapi/glib-2.0.vapi	Thu Jan  1 22:49:38 2009
@@ -810,14 +810,14 @@
 		long string_length = this.len ();
 		if (offset < 0) {
 			offset = string_length + offset;
-			GLib.warn_if_fail (offset >= 0);
+			GLib.return_val_if_fail (offset >= 0, null);
 		} else {
-			GLib.warn_if_fail (offset <= string_length);
+			GLib.return_val_if_fail (offset <= string_length, null);
 		}
 		if (len < 0) {
 			len = string_length - offset;
 		}
-		GLib.warn_if_fail (offset + len <= string_length);
+		GLib.return_val_if_fail (offset + len <= string_length, null);
 		weak string start = this.offset (offset);
 		return start.ndup (((char*) start.offset (len)) - ((char*) start));
 	}
@@ -1441,7 +1441,13 @@
 	public static void set_printerr_handler (PrintFunc func);
 
 	public static void return_if_fail (bool expr);
+	[CCode (sentinel = "")]
+	public static void return_val_if_fail (bool expr, ...);
+	[NoReturn]
 	public static void return_if_reached ();
+	[NoReturn]
+	[CCode (sentinel = "")]
+	public static void return_val_if_reached (...);
 	public static void warn_if_fail (bool expr);
 	public static void warn_if_reached ();