luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 11:12:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2793-clear-annotations' into 'main'

Browse Source 
gmem: Fix introspection annotations for g_clear_pointer() and g_clear_fd()

Closes #2793

See merge request GNOME/glib!3085
This commit is contained in:
Marco Trevisan 2022-11-22 17:27:34 +00:00
commit 1e5178b002
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gmem.c
View File

@ -232,8 +232,8 @@ g_free (gpointer mem)
/** /**
* g_clear_pointer: (skip) * g_clear_pointer: (skip)
* @pp: (not nullable): a pointer to a variable, struct member etc. holding a * @pp: (nullable) (not optional) (inout) (transfer full): a pointer to a
* pointer * variable, struct member etc. holding a pointer
* @destroy: a function to which a gpointer can be passed, to destroy *@pp * @destroy: a function to which a gpointer can be passed, to destroy *@pp
* *
* Clears a reference to a variable. * Clears a reference to a variable.

2
glib/gstdio.c
View File

@ -1839,7 +1839,7 @@ g_close (gint fd,
/** /**
* g_clear_fd: (skip) * g_clear_fd: (skip)
* @fd_ptr: (not nullable): a pointer to a file descriptor * @fd_ptr: (not optional) (inout) (transfer full): a pointer to a file descriptor
* @error: Used to return an error on failure * @error: Used to return an error on failure
* *
* If @fd_ptr points to a file descriptor, close it and return * If @fd_ptr points to a file descriptor, close it and return