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

gitypeinfo: Change gi_type_info_get_array_length_index() to return uint

Browse Source 
Rather than mixing `-1` and valid indexes, split out the indication of
whether the type is an array with a length argument from the actual
index of the length argument.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
Helps: #3155
This commit is contained in:
Philip Withnall 2024-01-16 23:26:02 +00:00
parent 33f157bd6b
commit fe6f9a661b
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
girepository/girwriter.c
View File

@ -244,7 +244,7 @@ write_type_info (const char *ns,
} }
else if (tag == GI_TYPE_TAG_ARRAY) else if (tag == GI_TYPE_TAG_ARRAY)
{ {
gssize length; unsigned int length_index;
size_t size; size_t size;
const char *name = NULL; const char *name = NULL;
@ -271,9 +271,8 @@ write_type_info (const char *ns,
type = gi_type_info_get_param_type (info, 0); type = gi_type_info_get_param_type (info, 0);
length = gi_type_info_get_array_length_index (info); if (gi_type_info_get_array_length_index (info, &length_index))
if (length >= 0) xml_printf (file, " length=\"%u\"", length_index);
xml_printf (file, " length=\"%" G_GSSIZE_FORMAT "\"", length);
if (gi_type_info_get_array_fixed_size (info, &size)) if (gi_type_info_get_array_fixed_size (info, &size))
xml_printf (file, " fixed-size=\"%zu\"", size); xml_printf (file, " fixed-size=\"%zu\"", size);

26
girepository/gitypeinfo.c
View File

@ -232,23 +232,25 @@ gi_type_info_get_interface (GITypeInfo *info)
/** /**
* gi_type_info_get_array_length_index: * gi_type_info_get_array_length_index:
* @info: a #GITypeInfo * @info: a #GITypeInfo
* @out_length_index: (out) (optional): return location for the length argument
* *
* Obtain the position of the argument which gives the array length of the type. * Obtain the position of the argument which gives the array length of the type.
* *
* The type tag must be a `GI_TYPE_TAG_ARRAY` or `-1` will be returned. * The type tag must be a `GI_TYPE_TAG_ARRAY` with a length argument, or `FALSE`
* will be returned.
* *
* Returns: the array length argument index, or `-1` if the type is not an array * Returns: `TRUE` if the type is an array and has a length argument
* or it has no length argument
* Since: 2.80 * Since: 2.80
*/ */
gssize gboolean
gi_type_info_get_array_length_index (GITypeInfo *info) gi_type_info_get_array_length_index (GITypeInfo *info,
unsigned int *out_length_index)
{ {
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
SimpleTypeBlob *type; SimpleTypeBlob *type;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, FALSE);
g_return_val_if_fail (GI_IS_TYPE_INFO (info), -1); g_return_val_if_fail (GI_IS_TYPE_INFO (info), FALSE);
type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
@ -259,11 +261,17 @@ gi_type_info_get_array_length_index (GITypeInfo *info)
if (blob->tag == GI_TYPE_TAG_ARRAY) if (blob->tag == GI_TYPE_TAG_ARRAY)
{ {
if (blob->has_length) if (blob->has_length)
return blob->dimensions.length; {
if (out_length_index != NULL)
*out_length_index = blob->dimensions.length;
return TRUE;
}
} }
} }
return -1; if (out_length_index != NULL)
*out_length_index = 0;
return FALSE;
} }
/** /**

3
girepository/gitypeinfo.h
View File

@ -96,7 +96,8 @@ GI_AVAILABLE_IN_ALL
GIBaseInfo * gi_type_info_get_interface (GITypeInfo *info); GIBaseInfo * gi_type_info_get_interface (GITypeInfo *info);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
gssize gi_type_info_get_array_length_index (GITypeInfo *info); gboolean gi_type_info_get_array_length_index (GITypeInfo *info,
unsigned int *out_length_index);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
gboolean gi_type_info_get_array_fixed_size (GITypeInfo *info, gboolean gi_type_info_get_array_fixed_size (GITypeInfo *info,