summaryrefslogtreecommitdiff
path: root/gio/gpollableinputstream.c
diff options
context:
space:
mode:
authorChristian Hergert <chergert@redhat.com>2016-10-28 18:29:02 -0700
committerChristian Hergert <chergert@redhat.com>2016-11-22 14:14:37 -0800
commit18a33f72db6a410606674d8d53fb2dadb706091d (patch)
treed12312302fad79c562f796d250ede4b58c2e0b01 /gio/gpollableinputstream.c
parenta4012abbdf2c6c095ae34a97dca760b2446436aa (diff)
downloadglib-18a33f72db6a410606674d8d53fb2dadb706091d.tar.gz
introspection: use (nullable) or (optional) instead of (allow-none)
If we have an input parameter (or return value) we need to use (nullable). However, if it is an (inout) or (out) parameter, (optional) is sufficient. It looks like (nullable) could be used for everything according to the Annotation documentation, but (optional) is more specific.
Diffstat (limited to 'gio/gpollableinputstream.c')
-rw-r--r--gio/gpollableinputstream.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gio/gpollableinputstream.c b/gio/gpollableinputstream.c
index 45947a440..2a43ea4cd 100644
--- a/gio/gpollableinputstream.c
+++ b/gio/gpollableinputstream.c
@@ -114,7 +114,7 @@ g_pollable_input_stream_is_readable (GPollableInputStream *stream)
/**
* g_pollable_input_stream_create_source:
* @stream: a #GPollableInputStream.
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
*
* Creates a #GSource that triggers when @stream can be read, or
* @cancellable is triggered or an error occurs. The callback on the
@@ -162,7 +162,7 @@ g_pollable_input_stream_default_read_nonblocking (GPollableInputStream *stream,
* @buffer: (array length=count) (element-type guint8): a buffer to
* read data into (which should be at least @count bytes long).
* @count: the number of bytes you want to read
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Attempts to read up to @count bytes from @stream into @buffer, as