diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2014-06-20 13:52:14 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2015-10-04 17:46:09 -0400 |
| commit | 10cb665fee2cc378dd2f13bad16e6384836a8b16 (patch) | |
| tree | 3d699aa40290c4902774233290ec89d277ff9dec /tests/scanner/Regress-1.0-expected.gir | |
| parent | 0a134a608f5b471c3a12739785e149ceaf90df27 (diff) | |
| download | gobject-introspection-10cb665fee2cc378dd2f13bad16e6384836a8b16.tar.gz | |
giscanner: Mark gpointer nodes as nullable by default
gpointer parameters and return types should be marked as nullable by
default, unless:
• also annotated with (type) and not with (nullable); or
• explicitly annotated with (not nullable).
This introduces the (not nullable) annotation as a direct opposite to
(nullable). In future, (not) could be extended to invert other
annotations.
https://bugzilla.gnome.org/show_bug.cgi?id=729660
Diffstat (limited to 'tests/scanner/Regress-1.0-expected.gir')
| -rw-r--r-- | tests/scanner/Regress-1.0-expected.gir | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index b856867f..dfbbd8d5 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -790,7 +790,10 @@ regress_annotation_object_watch_full().</doc> <instance-parameter name="object" transfer-ownership="none"> <type name="AnnotationObject" c:type="RegressAnnotationObject*"/> </instance-parameter> - <parameter name="data" transfer-ownership="none"> + <parameter name="data" + transfer-ownership="none" + nullable="1" + allow-none="1"> <doc xml:space="preserve">Opaque pointer handle</doc> <type name="gpointer" c:type="void*"/> </parameter> @@ -851,7 +854,10 @@ of tabs and strings to test the tab handling capabilities of the scanner.</doc> <type name="none" c:type="void"/> </return-value> <parameters> - <parameter name="arg1" transfer-ownership="none"> + <parameter name="arg1" + transfer-ownership="none" + nullable="1" + allow-none="1"> <type name="gpointer" c:type="gpointer"/> </parameter> </parameters> @@ -1071,7 +1077,10 @@ it says it's pointer but it's actually a string.</doc> <parameter name="b" transfer-ownership="none"> <type name="gboolean" c:type="gboolean"/> </parameter> - <parameter name="data" transfer-ownership="none"> + <parameter name="data" + transfer-ownership="none" + nullable="1" + allow-none="1"> <type name="gpointer" c:type="gpointer"/> </parameter> </parameters> @@ -1553,7 +1562,10 @@ uses a C sugar return type.</doc> <instance-parameter name="object" transfer-ownership="none"> <type name="FooObject" c:type="RegressFooObject*"/> </instance-parameter> - <parameter name="data" transfer-ownership="none"> + <parameter name="data" + transfer-ownership="none" + nullable="1" + allow-none="1"> <type name="gpointer" c:type="void*"/> </parameter> <parameter name="some_type" transfer-ownership="none"> @@ -1602,7 +1614,10 @@ uses a C sugar return type.</doc> <parameter name="object" transfer-ownership="none"> <type name="GObject.Object"/> </parameter> - <parameter name="p0" transfer-ownership="none"> + <parameter name="p0" + transfer-ownership="none" + nullable="1" + allow-none="1"> <type name="gpointer" c:type="gpointer"/> </parameter> </parameters> @@ -5486,11 +5501,7 @@ call and can be released on return.</doc> <type name="TestCallbackUserData" c:type="RegressTestCallbackUserData"/> </parameter> - <parameter name="user_data" - transfer-ownership="none" - nullable="1" - allow-none="1" - closure="1"> + <parameter name="user_data" transfer-ownership="none" closure="1"> <type name="gpointer" c:type="gpointer"/> </parameter> </parameters> |