luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-07 14:36:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

giunioninfo: 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:39:22 +00:00
parent 5db23afe14
commit b10b5a2fe6
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
girepository/girwriter.c
View File

@ -1249,8 +1249,7 @@ write_union_info (const gchar *ns,
const gchar *type_init; const gchar *type_init;
const gchar *func; const gchar *func;
gboolean deprecated; gboolean deprecated;
gint i; gsize size;
gint size;
name = gi_base_info_get_name ((GIBaseInfo *)info); name = gi_base_info_get_name ((GIBaseInfo *)info);
deprecated = gi_base_info_is_deprecated ((GIBaseInfo *)info); deprecated = gi_base_info_is_deprecated ((GIBaseInfo *)info);
@ -1268,8 +1267,8 @@ write_union_info (const gchar *ns,
xml_printf (file, " deprecated=\"1\""); xml_printf (file, " deprecated=\"1\"");
size = gi_union_info_get_size (info); size = gi_union_info_get_size (info);
if (file->show_all && size >= 0) if (file->show_all)
xml_printf (file, " size=\"%d\"", size); xml_printf (file, " size=\"%" G_GSIZE_FORMAT "\"", size);
func = gi_union_info_get_copy_function (info); func = gi_union_info_get_copy_function (info);
if (func) if (func)
@ -1283,7 +1282,7 @@ write_union_info (const gchar *ns,
if (gi_union_info_is_discriminated (info)) if (gi_union_info_is_discriminated (info))
{ {
gint offset; guint offset;
GITypeInfo *type; GITypeInfo *type;
offset = gi_union_info_get_discriminator_offset (info); offset = gi_union_info_get_discriminator_offset (info);
@ -1296,7 +1295,7 @@ write_union_info (const gchar *ns,
gi_base_info_unref ((GIBaseInfo *)type); gi_base_info_unref ((GIBaseInfo *)type);
} }
for (i = 0; i < gi_union_info_get_n_fields (info); i++) for (guint i = 0; i < gi_union_info_get_n_fields (info); i++)
{ {
GIFieldInfo *field = gi_union_info_get_field (info, i); GIFieldInfo *field = gi_union_info_get_field (info, i);
GIConstantInfo *constant = gi_union_info_get_discriminator (info, i); GIConstantInfo *constant = gi_union_info_get_discriminator (info, i);
@ -1306,7 +1305,7 @@ write_union_info (const gchar *ns,
gi_base_info_unref ((GIBaseInfo *)constant); gi_base_info_unref ((GIBaseInfo *)constant);
} }
for (i = 0; i < gi_union_info_get_n_methods (info); i++) for (guint i = 0; i < gi_union_info_get_n_methods (info); i++)
{ {
GIFunctionInfo *function = gi_union_info_get_method (info, i); GIFunctionInfo *function = gi_union_info_get_method (info, i);
write_function_info (ns, function, file); write_function_info (ns, function, file);

12
girepository/giunioninfo.c
View File

@ -53,7 +53,7 @@
* Returns: number of fields * Returns: number of fields
* Since: 2.80 * Since: 2.80
*/ */
gint guint
gi_union_info_get_n_fields (GIUnionInfo *info) gi_union_info_get_n_fields (GIUnionInfo *info)
{ {
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
@ -75,7 +75,7 @@ gi_union_info_get_n_fields (GIUnionInfo *info)
*/ */
GIFieldInfo * GIFieldInfo *
gi_union_info_get_field (GIUnionInfo *info, gi_union_info_get_field (GIUnionInfo *info,
gint n) guint n)
{ {
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
Header *header = (Header *)rinfo->typelib->data; Header *header = (Header *)rinfo->typelib->data;
@ -94,7 +94,7 @@ gi_union_info_get_field (GIUnionInfo *info,
* Returns: number of methods * Returns: number of methods
* Since: 2.80 * Since: 2.80
*/ */
gint guint
gi_union_info_get_n_methods (GIUnionInfo *info) gi_union_info_get_n_methods (GIUnionInfo *info)
{ {
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
@ -116,7 +116,7 @@ gi_union_info_get_n_methods (GIUnionInfo *info)
*/ */
GIFunctionInfo * GIFunctionInfo *
gi_union_info_get_method (GIUnionInfo *info, gi_union_info_get_method (GIUnionInfo *info,
gint n) guint n)
{ {
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
@ -157,7 +157,7 @@ gi_union_info_is_discriminated (GIUnionInfo *info)
* Returns: offset, in bytes, of the discriminator * Returns: offset, in bytes, of the discriminator
* Since: 2.80 * Since: 2.80
*/ */
gint guint
gi_union_info_get_discriminator_offset (GIUnionInfo *info) gi_union_info_get_discriminator_offset (GIUnionInfo *info)
{ {
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
@ -201,7 +201,7 @@ gi_union_info_get_discriminator_type (GIUnionInfo *info)
*/ */
GIConstantInfo * GIConstantInfo *
gi_union_info_get_discriminator (GIUnionInfo *info, gi_union_info_get_discriminator (GIUnionInfo *info,
gint n) guint n)
{ {
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset]; UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];

12
girepository/giunioninfo.h
View File

@ -44,31 +44,31 @@ G_BEGIN_DECLS
(gi_base_info_get_info_type ((GIBaseInfo*) info) == GI_INFO_TYPE_UNION) (gi_base_info_get_info_type ((GIBaseInfo*) info) == GI_INFO_TYPE_UNION)
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
gint gi_union_info_get_n_fields (GIUnionInfo *info); guint gi_union_info_get_n_fields (GIUnionInfo *info);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
GIFieldInfo * gi_union_info_get_field (GIUnionInfo *info, GIFieldInfo * gi_union_info_get_field (GIUnionInfo *info,
gint n); guint n);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
gint gi_union_info_get_n_methods (GIUnionInfo *info); guint gi_union_info_get_n_methods (GIUnionInfo *info);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
GIFunctionInfo * gi_union_info_get_method (GIUnionInfo *info, GIFunctionInfo * gi_union_info_get_method (GIUnionInfo *info,
gint n); guint n);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
gboolean gi_union_info_is_discriminated (GIUnionInfo *info); gboolean gi_union_info_is_discriminated (GIUnionInfo *info);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
gint gi_union_info_get_discriminator_offset (GIUnionInfo *info); guint gi_union_info_get_discriminator_offset (GIUnionInfo *info);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
GITypeInfo * gi_union_info_get_discriminator_type (GIUnionInfo *info); GITypeInfo * gi_union_info_get_discriminator_type (GIUnionInfo *info);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
GIConstantInfo * gi_union_info_get_discriminator (GIUnionInfo *info, GIConstantInfo * gi_union_info_get_discriminator (GIUnionInfo *info,
gint n); guint n);
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
GIFunctionInfo * gi_union_info_find_method (GIUnionInfo *info, GIFunctionInfo * gi_union_info_find_method (GIUnionInfo *info,