luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 14:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix signedness warning in gobject/gtype.c:iface_node_has_available_offset_L()

Browse Source 
gobject/gtype.c: In function ‘iface_node_has_available_offset_L’:
gobject/gtype.c:1288:42: error: comparison of integer expressions of different signedness: ‘gsize’ {aka ‘long unsigned int’} and ‘int’
 1288 |   if (G_ATOMIC_ARRAY_DATA_SIZE (offsets) <= offset)
      |                                          ^~
This commit is contained in:
Emmanuel Fleury 2020-11-16 18:01:46 +01:00
parent bbb9ef19ce
commit cc7540909f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gobject/gtype.c
View File

@ -286,7 +286,7 @@ struct _IFaceEntry
}; };
struct _IFaceEntries { struct _IFaceEntries {
guint offset_index; gsize offset_index;
IFaceEntry entry[1]; IFaceEntry entry[1];
}; };
@ -577,7 +577,7 @@ lookup_iface_entry_I (IFaceEntries *entries,
TypeNode *iface_node) TypeNode *iface_node)
{ {
guint8 *offsets; guint8 *offsets;
guint offset_index; gsize offset_index;
IFaceEntry *check; IFaceEntry *check;
gsize index; gsize index;
IFaceEntry *entry; IFaceEntry *entry;
@ -1280,7 +1280,7 @@ type_data_ref_U (TypeNode *node)
static gboolean static gboolean
iface_node_has_available_offset_L (TypeNode *iface_node, iface_node_has_available_offset_L (TypeNode *iface_node,
int offset, gsize offset,
int for_index) int for_index)
{ {
guint8 *offsets; guint8 *offsets;
@ -1299,29 +1299,31 @@ iface_node_has_available_offset_L (TypeNode *iface_node,
return FALSE; return FALSE;
} }
static int static gsize
find_free_iface_offset_L (IFaceEntries *entries) find_free_iface_offset_L (IFaceEntries *entries)
{ {
IFaceEntry *entry; IFaceEntry *entry;
TypeNode *iface_node; TypeNode *iface_node;
int offset; gsize offset;
int i; int i;
int n_entries; int n_entries;
n_entries = IFACE_ENTRIES_N_ENTRIES (entries); n_entries = IFACE_ENTRIES_N_ENTRIES (entries);
offset = -1; offset = 0;
do do
{ {
offset++;
for (i = 0; i < n_entries; i++) for (i = 0; i < n_entries; i++)
{ {
entry = &entries->entry[i]; entry = &entries->entry[i];
iface_node = lookup_type_node_I (entry->iface_type); iface_node = lookup_type_node_I (entry->iface_type);
if (!iface_node_has_available_offset_L (iface_node, offset, i)) if (!iface_node_has_available_offset_L (iface_node, offset, i))
{
offset++;
break; break;
} }
} }
}
while (i != n_entries); while (i != n_entries);
return offset; return offset;
@ -1329,12 +1331,12 @@ find_free_iface_offset_L (IFaceEntries *entries)
static void static void
iface_node_set_offset_L (TypeNode *iface_node, iface_node_set_offset_L (TypeNode *iface_node,
int offset, gsize offset,
int index) int index)
{ {
guint8 *offsets, *old_offsets; guint8 *offsets, *old_offsets;
int new_size, old_size; gsize new_size, old_size;
int i; gsize i;
old_offsets = G_ATOMIC_ARRAY_GET_LOCKED (&iface_node->_prot.offsets, guint8); old_offsets = G_ATOMIC_ARRAY_GET_LOCKED (&iface_node->_prot.offsets, guint8);
if (old_offsets == NULL) if (old_offsets == NULL)