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

gistructinfo: Fix int signedness in APIs

Browse Source 
Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3155
This commit is contained in:
Philip Withnall 2023-12-12 18:18:20 +00:00
parent e4332bc78d
commit cacf8cc93b
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
girepository/girwriter.c
View File

@ -650,9 +650,8 @@ write_struct_info (const gchar *ns,
gboolean deprecated;
gboolean is_gtype_struct;
gboolean foreign;
gint i;
gint size;
int n_elts;
guint n_elts;
name = gi_base_info_get_name ((GIBaseInfo *)info);
deprecated = gi_base_info_is_deprecated ((GIBaseInfo *)info);
@ -702,14 +701,14 @@ write_struct_info (const gchar *ns,
n_elts = gi_struct_info_get_n_fields (info) + gi_struct_info_get_n_methods (info);
if (n_elts > 0)
{
for (i = 0; i < gi_struct_info_get_n_fields (info); i++)
for (guint i = 0; i < gi_struct_info_get_n_fields (info); i++)
{
GIFieldInfo *field = gi_struct_info_get_field (info, i);
write_field_info (ns, field, NULL, file);
gi_base_info_unref ((GIBaseInfo *)field);
}
for (i = 0; i < gi_struct_info_get_n_methods (info); i++)
for (guint i = 0; i < gi_struct_info_get_n_methods (info); i++)
{
GIFunctionInfo *function = gi_struct_info_get_method (info, i);
write_function_info (ns, function, file);

13
girepository/gistructinfo.c
View File

@ -52,7 +52,7 @@
*
* Returns: number of fields
*/
gint
guint
gi_struct_info_get_n_fields (GIStructInfo *info)
{
GIRealInfo *rinfo = (GIRealInfo *)info;
@ -72,15 +72,14 @@ gi_struct_info_get_n_fields (GIStructInfo *info)
*/
static gint32
gi_struct_get_field_offset (GIStructInfo *info,
gint n)
guint n)
{
GIRealInfo *rinfo = (GIRealInfo *)info;
Header *header = (Header *)rinfo->typelib->data;
guint32 offset = rinfo->offset + header->struct_blob_size;
gint i;
FieldBlob *field_blob;
for (i = 0; i < n; i++)
for (guint i = 0; i < n; i++)
{
field_blob = (FieldBlob *)&rinfo->typelib->data[offset];
offset += header->field_blob_size;
@ -103,7 +102,7 @@ gi_struct_get_field_offset (GIStructInfo *info,
*/
GIFieldInfo *
gi_struct_info_get_field (GIStructInfo *info,
gint n)
guint n)
{
GIRealInfo *rinfo = (GIRealInfo *)info;
@ -161,7 +160,7 @@ gi_struct_info_find_field (GIStructInfo *info,
*
* Returns: number of methods
*/
gint
guint
gi_struct_info_get_n_methods (GIStructInfo *info)
{
GIRealInfo *rinfo = (GIRealInfo *)info;
@ -182,7 +181,7 @@ gi_struct_info_get_n_methods (GIStructInfo *info)
*/
GIFunctionInfo *
gi_struct_info_get_method (GIStructInfo *info,
gint n)
guint n)
{
GIRealInfo *rinfo = (GIRealInfo *)info;
StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];

8
girepository/gistructinfo.h
View File

@ -43,22 +43,22 @@ G_BEGIN_DECLS
GI_AVAILABLE_IN_ALL
gint gi_struct_info_get_n_fields (GIStructInfo *info);
guint gi_struct_info_get_n_fields (GIStructInfo *info);
GI_AVAILABLE_IN_ALL
GIFieldInfo * gi_struct_info_get_field (GIStructInfo *info,
gint n);
guint n);
GI_AVAILABLE_IN_ALL
GIFieldInfo * gi_struct_info_find_field (GIStructInfo *info,
const gchar *name);
GI_AVAILABLE_IN_ALL
gint gi_struct_info_get_n_methods (GIStructInfo *info);
guint gi_struct_info_get_n_methods (GIStructInfo *info);
GI_AVAILABLE_IN_ALL
GIFunctionInfo * gi_struct_info_get_method (GIStructInfo *info,
gint n);
guint n);
GI_AVAILABLE_IN_ALL
GIFunctionInfo * gi_struct_info_find_method (GIStructInfo *info,