[glib] Partially revert "gio: Add missing (array length) annotations"
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Partially revert "gio: Add missing (array length) annotations"
- Date: Thu, 21 Sep 2017 11:05:58 +0000 (UTC)
commit 09796b3ccc8c7b9785fe66887e20f506cb58c7a4
Author: Philip Withnall <withnall endlessm com>
Date: Thu Sep 21 12:05:06 2017 +0100
Partially revert "gio: Add missing (array length) annotations"
This reverts commit 80284943351a620f6931bfa74cbe07b8d61b5e08.
Adding (array length=…) to a gchar* parameter causes the GIR file to
contain an array of strings, rather than an array of characters. While
we fix GIR, revert those changes.
Some of the other changes in the file (which have an explicit
(element-type) already) are fine.
Signed-off-by: Philip Withnall <withnall endlessm com>
https://bugzilla.gnome.org/show_bug.cgi?id=765063
gio/gdatainputstream.c | 4 ++--
gio/gdbusutils.c | 2 +-
gio/gtlspassword.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c
index 9380358..348ce44 100644
--- a/gio/gdatainputstream.c
+++ b/gio/gdatainputstream.c
@@ -1292,7 +1292,7 @@ g_data_input_stream_read_until_finish (GDataInputStream *stream,
/**
* g_data_input_stream_read_upto:
* @stream: a #GDataInputStream
- * @stop_chars: (array length=stop_chars_len): characters to terminate the read
+ * @stop_chars: characters to terminate the read
* @stop_chars_len: length of @stop_chars. May be -1 if @stop_chars is
* nul-terminated
* @length: (out) (optional): a #gsize to get the length of the data read in
@@ -1384,7 +1384,7 @@ g_data_input_stream_read_upto (GDataInputStream *stream,
/**
* g_data_input_stream_read_upto_async:
* @stream: a #GDataInputStream
- * @stop_chars: (array length=stop_chars_len): characters to terminate the read
+ * @stop_chars: characters to terminate the read
* @stop_chars_len: length of @stop_chars. May be -1 if @stop_chars is
* nul-terminated
* @io_priority: the [I/O priority][io-priority] of the request
diff --git a/gio/gdbusutils.c b/gio/gdbusutils.c
index 8d5e9be..ff036c7 100644
--- a/gio/gdbusutils.c
+++ b/gio/gdbusutils.c
@@ -313,7 +313,7 @@ g_dbus_generate_guid (void)
/**
* g_dbus_is_guid:
- * @string: (array fixed-size=33): The string to check.
+ * @string: The string to check.
*
* Checks if @string is a D-Bus GUID.
*
diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c
index 3d2c74d..1e437a7 100644
--- a/gio/gtlspassword.c
+++ b/gio/gtlspassword.c
@@ -295,7 +295,7 @@ g_tls_password_set_value (GTlsPassword *password,
/**
* g_tls_password_set_value_full:
* @password: a #GTlsPassword object
- * @value: the value for the password
+ * @value: (array length=length): the value for the password
* @length: the length of the password, or -1
* @destroy: (nullable): a function to use to free the password.
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]