summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2018-03-10 20:14:09 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2018-03-10 20:25:27 +0100
commitea8b4e552fe14a19c608193d13ff728c7b4b1ac7 (patch)
tree1013cf6d0dad18ab647321ab4106d93c09d3647a
parentc4b300d4032ffd00ab9abd474dc779238f2d2a64 (diff)
downloadgobject-introspection-ea8b4e552fe14a19c608193d13ff728c7b4b1ac7.tar.gz
gir: Update annotations from GLib git master
(cherry picked from commit 695ed85afa9034a8d68a71572fa5450c428cd8be)
-rw-r--r--gir/gio-2.0.c6
-rw-r--r--gir/glib-2.0.c19
2 files changed, 23 insertions, 2 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 11b07ce3..b8500132 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -16122,6 +16122,8 @@
* Note that @stop_chars may contain '\0' if @stop_chars_len is
* specified.
*
+ * The returned string will always be nul-terminated on success.
+ *
* Returns: (transfer full): a string with the data that was read
* before encountering any of the stop characters. Set @length to
* a #gsize to get the length of the string. This function will
@@ -16174,6 +16176,8 @@
* have to use g_data_input_stream_read_byte() to get it before calling
* g_data_input_stream_read_upto_async() again.
*
+ * The returned string will always be nul-terminated on success.
+ *
* Returns: (transfer full): a string with the data that was read
* before encountering any of the stop characters. Set @length to
* a #gsize to get the length of the string. This function will
@@ -30481,7 +30485,7 @@
* used as the port number to connect to.
*
* In general, @host_and_port is expected to be provided by the user
- * (allowing them to give the hostname, and a port overide if necessary)
+ * (allowing them to give the hostname, and a port override if necessary)
* and @default_port is expected to be provided by the application.
*
* (The port component of @host_and_port can also be specified as a
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 98c2f02e..56926fc0 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -8903,7 +8903,8 @@
*
* The @clear_func will be called when an element in the array
* data segment is removed and when the array is freed and data
- * segment is deallocated as well.
+ * segment is deallocated as well. @clear_func will be passed a
+ * pointer to the element to clear, rather than the element itself.
*
* Note that in contrast with other uses of #GDestroyNotify
* functions, @clear_func is expected to clear the contents of
@@ -14051,6 +14052,11 @@
* Creates a copy of @datetime and adds the specified number of months to the
* copy. Add negative values to subtract months.
*
+ * The day of the month of the resulting #GDateTime is clamped to the number
+ * of days in the updated calendar month. For example, if adding 1 month to
+ * 31st January 2018, the result would be 28th February 2018. In 2020 (a leap
+ * year), the result would be 29th February.
+ *
* Returns: the newly created #GDateTime which should be freed with
* g_date_time_unref().
* Since: 2.26
@@ -14093,6 +14099,9 @@
* Creates a copy of @datetime and adds the specified number of years to the
* copy. Add negative values to subtract years.
*
+ * As with g_date_time_add_months(), if the resulting date would be 29th
+ * February on a non-leap year, the day will be clamped to 28th February.
+ *
* Returns: the newly created #GDateTime which should be freed with
* g_date_time_unref().
* Since: 2.26
@@ -14236,6 +14245,14 @@
* - 0: Pad a numeric result with zeros. This overrides the default padding
* for the specifier.
*
+ * Additionally, when O is used with B, b, or h, it produces the alternative
+ * form of a month name. The alternative form should be used when the month
+ * name is used without a day number (e.g., standalone). It is required in
+ * some languages (Baltic, Slavic, Greek, and more) due to their grammatical
+ * rules. For other languages there is no difference. \%OB is a GNU and BSD
+ * strftime() extension expected to be added to the future POSIX specification,
+ * \%Ob and \%Oh are GNU strftime() extensions. Since: 2.56
+ *
* Returns: a newly allocated string formatted to the requested format
* or %NULL in the case that there was an error (such as a format specifier
* not being supported in the current locale). The string