]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
glib-2.0: Fix some issues for the experimental non-null checks
authorJacques-Pascal Deplaix <jp.deplaix@gmail.com>
Mon, 20 Jun 2011 17:28:13 +0000 (19:28 +0200)
committerJürg Billeter <j@bitron.ch>
Tue, 31 Jan 2012 12:09:07 +0000 (13:09 +0100)
Fixes bug 651841.

vapi/glib-2.0.vapi

index a3e6c94fc0562daee13b7aa1e6726e87c03959c1..5d34e36e8e5e49e8563cbffd94a056872ccc70e9 100644 (file)
@@ -1361,7 +1361,7 @@ public class string {
                if (str == null) {
                        str_size = 0;
                } else {
-                       str_size = str.length;
+                       str_size = ((!)(str)).length;
                }
 
                string* result = GLib.malloc0 (this.length - (end - start) + str_size + 1);
@@ -3086,12 +3086,12 @@ namespace GLib {
                                if (c == '\n') {
                                        break;
                                }
-                               ret.append_c ((char) c);
+                               ((!)(ret)).append_c ((char) c);
                        }
                        if (ret == null) {
                                return null;
                        } else {
-                               return ret.str;
+                               return ((!)(ret)).str;
                        }
                }
        }