Do not use g_warn_if_fail to not require glib 2.16

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

svn path=/trunk/; revision=2253

diff --git a/ChangeLog b/ChangeLog
index 82f98b5c9bd1e0de62736d0fd8815373c0c2ce29..91cf462ae30b54c173b61bbf1d86f294d6ddf6b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
+
 2009-01-01  Jürg Billeter  <j@bitron.ch>
 
        * vapi/packages/gtk+-2.0/:

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 5f89bd879d5aa54059caf7f67c1da53c25260b1a..4eec99c1a5a9f2fe4ebf10ebb186032585a189f9 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -810,14 +810,14 @@ public class string {
                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 @@ namespace GLib {
        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 ();