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

Revert "Rename all user datas in callbacks to user_data"

Browse Source 
This reverts commit 1422e5f81241650c634413911e92d23495692545. The renaming of parameters implicitly introduced "closure" annotations in the documentation which are wrong on callbacks.
This commit is contained in:
badcel 2023-01-09 13:11:21 +01:00
parent 19a02d7d14
commit b24f6ca27d
No known key found for this signature in database
GPG Key ID: 70A8373EEB2233E0
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glib/goption.h
View File

@ -138,8 +138,8 @@ typedef enum
* single dash followed by a single letter (for a short name) or two dashes * single dash followed by a single letter (for a short name) or two dashes
* followed by a long option name. * followed by a long option name.
* @value: The value to be parsed. * @value: The value to be parsed.
* @user_data: User data added to the #GOptionGroup containing the option when * @data: User data added to the #GOptionGroup containing the option when it
* it was created with g_option_group_new() * was created with g_option_group_new()
* @error: A return location for errors. The error code %G_OPTION_ERROR_FAILED * @error: A return location for errors. The error code %G_OPTION_ERROR_FAILED
* is intended to be used for errors in #GOptionArgFunc callbacks. * is intended to be used for errors in #GOptionArgFunc callbacks.
* *
@ -151,15 +151,15 @@ typedef enum
*/ */
typedef gboolean (*GOptionArgFunc) (const gchar *option_name, typedef gboolean (*GOptionArgFunc) (const gchar *option_name,
const gchar *value, const gchar *value,
gpointer user_data, gpointer data,
GError **error); GError **error);
/** /**
* GOptionParseFunc: * GOptionParseFunc:
* @context: The active #GOptionContext * @context: The active #GOptionContext
* @group: The group to which the function belongs * @group: The group to which the function belongs
* @user_data: User data added to the #GOptionGroup containing the option when * @data: User data added to the #GOptionGroup containing the option when it
* it was created with g_option_group_new() * was created with g_option_group_new()
* @error: A return location for error details * @error: A return location for error details
* *
* The type of function that can be called before and after parsing. * The type of function that can be called before and after parsing.
@ -169,22 +169,22 @@ typedef gboolean (*GOptionArgFunc) (const gchar *option_name,
*/ */
typedef gboolean (*GOptionParseFunc) (GOptionContext *context, typedef gboolean (*GOptionParseFunc) (GOptionContext *context,
GOptionGroup *group, GOptionGroup *group,
gpointer user_data, gpointer data,
GError **error); GError **error);
/** /**
* GOptionErrorFunc: * GOptionErrorFunc:
* @context: The active #GOptionContext * @context: The active #GOptionContext
* @group: The group to which the function belongs * @group: The group to which the function belongs
* @user_data: User data added to the #GOptionGroup containing the option when * @data: User data added to the #GOptionGroup containing the option when it
* it was created with g_option_group_new() * was created with g_option_group_new()
* @error: The #GError containing details about the parse error * @error: The #GError containing details about the parse error
* *
* The type of function to be used as callback when a parse error occurs. * The type of function to be used as callback when a parse error occurs.
*/ */
typedef void (*GOptionErrorFunc) (GOptionContext *context, typedef void (*GOptionErrorFunc) (GOptionContext *context,
GOptionGroup *group, GOptionGroup *group,
gpointer user_data, gpointer data,
GError **error); GError **error);
/** /**

4
glib/gtree.h
View File

@ -55,7 +55,7 @@ typedef gboolean (*GTraverseFunc) (gpointer key,
/** /**
* GTraverseNodeFunc: * GTraverseNodeFunc:
* @node: a #GTreeNode * @node: a #GTreeNode
* @user_data: user data passed to g_tree_foreach_node() * @data: user data passed to g_tree_foreach_node()
* *
* Specifies the type of function passed to g_tree_foreach_node(). It is * Specifies the type of function passed to g_tree_foreach_node(). It is
* passed each node, together with the @user_data parameter passed to * passed each node, together with the @user_data parameter passed to
@ -66,7 +66,7 @@ typedef gboolean (*GTraverseFunc) (gpointer key,
* Since: 2.68 * Since: 2.68
*/ */
typedef gboolean (*GTraverseNodeFunc) (GTreeNode *node, typedef gboolean (*GTraverseNodeFunc) (GTreeNode *node,
gpointer user_data); gpointer data);
/* Balanced binary trees /* Balanced binary trees
*/ */

4
glib/gtypes.h
View File

@ -172,7 +172,7 @@ typedef void (*GFreeFunc) (gpointer data);
/** /**
* GTranslateFunc: * GTranslateFunc:
* @str: the untranslated string * @str: the untranslated string
* @user_data: user data specified when installing the function, e.g. * @data: user data specified when installing the function, e.g.
* in g_option_group_set_translate_func() * in g_option_group_set_translate_func()
* *
* The type of functions which are used to translate user-visible * The type of functions which are used to translate user-visible
@ -182,7 +182,7 @@ typedef void (*GFreeFunc) (gpointer data);
* The returned string is owned by GLib and must not be freed. * The returned string is owned by GLib and must not be freed.
*/ */
typedef const gchar * (*GTranslateFunc) (const gchar *str, typedef const gchar * (*GTranslateFunc) (const gchar *str,
gpointer user_data); gpointer data);
/* Define some mathematical constants that aren't available /* Define some mathematical constants that aren't available