luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-27 18:10:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Partially revert "gio: Add missing (array length) annotations"

Browse Source 
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
This commit is contained in:
Philip Withnall 2017-09-21 12:05:06 +01:00
parent 8028494335
commit 09796b3ccc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gdatainputstream.c
View File

@ -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

2
gio/gdbusutils.c
View File

@ -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.
*

2
gio/gtlspassword.c
View File

@ -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.
*