Merge branch 'genum-annotations' into 'main'

Add missing `(array zero-terminated=1)` annotations

See merge request GNOME/glib!4669
This commit is contained in:
Philip Withnall
2025-06-25 13:06:22 +00:00
2 changed files with 12 additions and 14 deletions

View File

@@ -232,9 +232,9 @@ g_flags_register_static (const gchar *name,
* g_enum_complete_type_info: * g_enum_complete_type_info:
* @g_enum_type: the type identifier of the type being completed * @g_enum_type: the type identifier of the type being completed
* @info: (out callee-allocates): the #GTypeInfo struct to be filled in * @info: (out callee-allocates): the #GTypeInfo struct to be filled in
* @const_values: An array of #GEnumValue structs for the possible * @const_values: (array zero-terminated=1): An array of #GEnumValue
* enumeration values. The array is terminated by a struct with all * structs for the possible enumeration values. The array is terminated
* members being 0. * by a struct with all members being 0.
* *
* This function is meant to be called from the `complete_type_info` * This function is meant to be called from the `complete_type_info`
* function of a #GTypePlugin implementation, as in the following * function of a #GTypePlugin implementation, as in the following
@@ -278,9 +278,9 @@ g_enum_complete_type_info (GType g_enum_type,
* g_flags_complete_type_info: * g_flags_complete_type_info:
* @g_flags_type: the type identifier of the type being completed * @g_flags_type: the type identifier of the type being completed
* @info: (out callee-allocates): the #GTypeInfo struct to be filled in * @info: (out callee-allocates): the #GTypeInfo struct to be filled in
* @const_values: An array of #GFlagsValue structs for the possible * @const_values: (array zero-terminated=1): An array of #GFlagsValue
* enumeration values. The array is terminated by a struct with all * structs for the possible enumeration values. The array is terminated
* members being 0. * by a struct with all members being 0.
* *
* This function is meant to be called from the complete_type_info() * This function is meant to be called from the complete_type_info()
* function of a #GTypePlugin implementation, see the example for * function of a #GTypePlugin implementation, see the example for

View File

@@ -525,10 +525,9 @@ g_type_module_add_interface (GTypeModule *module,
* g_type_module_register_enum: * g_type_module_register_enum:
* @module: (nullable): a #GTypeModule * @module: (nullable): a #GTypeModule
* @name: name for the type * @name: name for the type
* @const_static_values: an array of #GEnumValue structs for the * @const_static_values: (array zero-terminated=1): an array of #GEnumValue
* possible enumeration values. The array is * structs for the possible enumeration values. The array is terminated by a
* terminated by a struct with all members being * struct with all members being 0.
* 0.
* *
* Looks up or registers an enumeration that is implemented with a particular * Looks up or registers an enumeration that is implemented with a particular
* type plugin. If a type with name @type_name was previously registered, * type plugin. If a type with name @type_name was previously registered,
@@ -567,10 +566,9 @@ g_type_module_register_enum (GTypeModule *module,
* g_type_module_register_flags: * g_type_module_register_flags:
* @module: (nullable): a #GTypeModule * @module: (nullable): a #GTypeModule
* @name: name for the type * @name: name for the type
* @const_static_values: an array of #GFlagsValue structs for the * @const_static_values: (array zero-terminated=1): an array of #GFlagsValue
* possible flags values. The array is * structs for the possible flags values. The array is terminated by a struct
* terminated by a struct with all members being * with all members being 0.
* 0.
* *
* Looks up or registers a flags type that is implemented with a particular * Looks up or registers a flags type that is implemented with a particular
* type plugin. If a type with name @type_name was previously registered, * type plugin. If a type with name @type_name was previously registered,