Merge branch 'fix_extra_warnings' into 'master'

Fix more warnings

See merge request GNOME/glib!1765
This commit is contained in:
Philip Withnall 2020-11-24 15:37:21 +00:00
commit 77361ef45e
2 changed files with 8 additions and 8 deletions

View File

@ -749,7 +749,7 @@ g_object_class_install_properties (GObjectClass *oclass,
GParamSpec **pspecs)
{
GType oclass_type, parent_type;
gint i;
guint i;
g_return_if_fail (G_IS_OBJECT_CLASS (oclass));
g_return_if_fail (n_pspecs > 1);
@ -1798,7 +1798,7 @@ g_object_new_with_custom_constructor (GObjectClass *class,
gint n_cparams;
gint cvals_used;
GSList *node;
gint i;
guint i;
/* If we have ->constructed() then we have to do a lot more work.
* It's possible that this is a singleton and it's also possible
@ -1828,7 +1828,7 @@ g_object_new_with_custom_constructor (GObjectClass *class,
{
GParamSpec *pspec;
GValue *value;
gint j;
guint j;
pspec = node->data;
value = NULL; /* to silence gcc... */
@ -1954,7 +1954,7 @@ g_object_new_internal (GObjectClass *class,
{
const GValue *value;
GParamSpec *pspec;
gint j;
guint j;
pspec = node->data;
value = NULL; /* to silence gcc... */
@ -1980,7 +1980,7 @@ g_object_new_internal (GObjectClass *class,
if (nqueue)
{
gint i;
guint i;
/* Set remaining properties. The construct properties will
* already have been taken, so set only the non-construct

View File

@ -579,7 +579,7 @@ lookup_iface_entry_I (IFaceEntries *entries,
guint8 *offsets;
guint offset_index;
IFaceEntry *check;
int index;
gsize index;
IFaceEntry *entry;
if (entries == NULL)
@ -1369,7 +1369,7 @@ type_node_add_iface_entry_W (TypeNode *node,
IFaceEntry *entry;
TypeNode *iface_node;
guint i, j;
int num_entries;
guint num_entries;
g_assert (node->is_instantiatable);
@ -1608,7 +1608,7 @@ g_type_interface_add_prerequisite (GType interface_type,
}
}
for (i = 0; i < prerequisite_node->n_supers + 1; i++)
for (i = 0; i < prerequisite_node->n_supers + 1u; i++)
type_iface_add_prerequisite_W (iface, lookup_type_node_I (prerequisite_node->supers[i]));
G_WRITE_UNLOCK (&type_rw_lock);
}