summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2019-03-04 18:58:13 +0100
committerChristoph Reiter <reiter.christoph@gmail.com>2019-03-04 18:58:13 +0100
commitb04dea6e5d82d567f0575caf85eb61b9cae2a10f (patch)
treeeb85c2de9205b9e200a3797c03701b6e6c6b0cc2
parent8d1aa1e9286ca561810ebad8127ba267203bf9b0 (diff)
downloadgobject-introspection-b04dea6e5d82d567f0575caf85eb61b9cae2a10f.tar.gz
Update glib annotations
-rw-r--r--gir/gio-2.0.c2
-rw-r--r--gir/glib-2.0.c88
-rw-r--r--gir/gobject-2.0.c18
3 files changed, 32 insertions, 76 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 05f6e1d8..f3f060c9 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -7528,7 +7528,7 @@
* When debugging a program or testing a change to an installed version, it is often useful to be able to
* replace resources in the program or library, without recompiling, for debugging or quick hacking and testing
* purposes. Since GLib 2.50, it is possible to use the `G_RESOURCE_OVERLAYS` environment variable to selectively overlay
- * resources with replacements from the filesystem. It is a colon-separated list of substitutions to perform
+ * resources with replacements from the filesystem. It is a %G_SEARCHPATH_SEPARATOR-separated list of substitutions to perform
* during resource lookups.
*
* A substitution has the form
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index b86ab02e..8f46e723 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -4520,40 +4520,6 @@
/**
- * G_MININT16:
- *
- * The minimum value which can be held in a #gint16.
- *
- * Since: 2.4
- */
-
-
-/**
- * G_MININT32:
- *
- * The minimum value which can be held in a #gint32.
- *
- * Since: 2.4
- */
-
-
-/**
- * G_MININT64:
- *
- * The minimum value which can be held in a #gint64.
- */
-
-
-/**
- * G_MININT8:
- *
- * The minimum value which can be held in a #gint8.
- *
- * Since: 2.4
- */
-
-
-/**
* G_MINLONG:
*
* The minimum value which can be held in a #glong.
@@ -6026,6 +5992,8 @@
* gint fd;
* int saved_errno;
*
+ * g_return_val_if_fail (error == NULL || *error == NULL, -1);
+ *
* fd = open ("file.txt", O_RDONLY);
* saved_errno = errno;
*
@@ -11544,7 +11512,7 @@
/**
* g_base64_decode:
- * @text: zero-terminated string with base64 text to decode
+ * @text: (not nullable): zero-terminated string with base64 text to decode
* @out_len: (out): The length of the decoded data is written here
*
* Decode a sequence of Base-64 encoded text into binary data. Note
@@ -11598,7 +11566,7 @@
/**
* g_base64_encode:
- * @data: (array length=len) (element-type guint8): the binary data to encode
+ * @data: (array length=len) (element-type guint8) (nullable): the binary data to encode
* @len: the length of @data
*
* Encode a sequence of binary data into its Base-64 stringified
@@ -29871,7 +29839,7 @@
* a command line, and the C runtime startup code does a corresponding
* reconstruction of an argument vector from the command line, to be
* passed to main(). Complications arise when you have argument vector
- * elements that contain spaces of double quotes. The spawn*() functions
+ * elements that contain spaces or double quotes. The `spawn*()` functions
* don't do any quoting or escaping, but on the other hand the startup
* code does do unquoting and unescaping in order to enable receiving
* arguments with embedded spaces or double quotes. To work around this
@@ -30690,15 +30658,17 @@
* g_string_append_len:
* @string: a #GString
* @val: bytes to append
- * @len: number of bytes of @val to use
+ * @len: number of bytes of @val to use, or -1 for all of @val
+ *
+ * Appends @len bytes of @val to @string.
*
- * Appends @len bytes of @val to @string. Because @len is
- * provided, @val may contain embedded nuls and need not
- * be nul-terminated.
+ * If @len is positive, @val may contain embedded nuls and need
+ * not be nul-terminated. It is the caller's responsibility to
+ * ensure that @val has at least @len addressable bytes.
*
- * Since this function does not stop at nul bytes, it is
- * the caller's responsibility to ensure that @val has at
- * least @len addressable bytes.
+ * If @len is negative, @val must be nul-terminated and @len
+ * is considered to request the entire string length. This
+ * makes g_string_append_len() equivalent to g_string_append().
*
* Returns: (transfer none): @string
*/
@@ -31015,16 +30985,18 @@
* @pos: position in @string where insertion should
* happen, or -1 for at the end
* @val: bytes to insert
- * @len: number of bytes of @val to insert
+ * @len: number of bytes of @val to insert, or -1 for all of @val
*
* Inserts @len bytes of @val into @string at @pos.
- * Because @len is provided, @val may contain embedded
- * nuls and need not be nul-terminated. If @pos is -1,
- * bytes are inserted at the end of the string.
*
- * Since this function does not stop at nul bytes, it is
- * the caller's responsibility to ensure that @val has at
- * least @len addressable bytes.
+ * If @len is positive, @val may contain embedded nuls and need
+ * not be nul-terminated. It is the caller's responsibility to
+ * ensure that @val has at least @len addressable bytes.
+ *
+ * If @len is negative, @val must be nul-terminated and @len
+ * is considered to request the entire string length.
+ *
+ * If @pos is -1, bytes are inserted at the end of the string.
*
* Returns: (transfer none): @string
*/
@@ -31128,15 +31100,17 @@
* g_string_prepend_len:
* @string: a #GString
* @val: bytes to prepend
- * @len: number of bytes in @val to prepend
+ * @len: number of bytes in @val to prepend, or -1 for all of @val
*
* Prepends @len bytes of @val to @string.
- * Because @len is provided, @val may contain
- * embedded nuls and need not be nul-terminated.
*
- * Since this function does not stop at nul bytes,
- * it is the caller's responsibility to ensure that
- * @val has at least @len addressable bytes.
+ * If @len is positive, @val may contain embedded nuls and need
+ * not be nul-terminated. It is the caller's responsibility to
+ * ensure that @val has at least @len addressable bytes.
+ *
+ * If @len is negative, @val must be nul-terminated and @len
+ * is considered to request the entire string length. This
+ * makes g_string_prepend_len() equivalent to g_string_prepend().
*
* Returns: (transfer none): @string
*/
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index 67539ec5..d5d50385 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -961,24 +961,6 @@
/**
- * g_cclosure_marshal_BOOL__BOXED_BOXED:
- * @closure: A #GClosure.
- * @return_value: A #GValue to store the return value. May be %NULL
- * if the callback of closure doesn't return a value.
- * @n_param_values: The length of the @param_values array.
- * @param_values: An array of #GValues holding the arguments
- * on which to invoke the callback of closure.
- * @invocation_hint: The invocation hint given as the last argument to
- * g_closure_invoke().
- * @marshal_data: Additional data specified when registering the
- * marshaller, see g_closure_set_marshal() and
- * g_closure_set_meta_marshal()
- *
- * An old alias for g_cclosure_marshal_BOOLEAN__BOXED_BOXED().
- */
-
-
-/**
* g_cclosure_marshal_BOOL__FLAGS:
*
* Another name for g_cclosure_marshal_BOOLEAN__FLAGS().