diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2020-11-24 15:37:21 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2020-11-24 15:37:21 +0000 |
| commit | 77361ef45e4ab39e21e90040debcbccd0f6aa169 (patch) | |
| tree | f4052794ae25e66f72ba67c72be49e81e0fd7954 | |
| parent | 69f0f3326755891c48783c3831c71c5ea3d659a1 (diff) | |
| parent | 236d6281b829a1c2f71a90915c6c1c2a3edd68a5 (diff) | |
Merge branch 'fix_extra_warnings' into 'master'
Fix more warnings
See merge request GNOME/glib!1765
| -rw-r--r-- | gobject/gobject.c | 10 | ||||
| -rw-r--r-- | gobject/gtype.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gobject/gobject.c b/gobject/gobject.c index 6ab662eaa..863d5b67a 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -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 diff --git a/gobject/gtype.c b/gobject/gtype.c index 69cd27512..f83c1caee 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -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); } |