From bbb9ef19ce58dc0642d29c6f1287d8c70ab30d5d Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Mon, 16 Nov 2020 17:41:46 +0100 Subject: [PATCH 1/6] Fix signedness warnings in gobject/tests/value.c:test_valuearray_basic() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gobject/tests/value.c: In function ‘test_valuearray_basic’: gobject/tests/value.c:253:17: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 253 | for (i = 0; i < a->n_values - 1; i++) | ^ gobject/tests/value.c:257:17: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 257 | for (i = 0; i < a->n_values; i++) | ^ --- gobject/tests/value.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gobject/tests/value.c b/gobject/tests/value.c index b3ea223f9..2e7bdb06e 100644 --- a/gobject/tests/value.c +++ b/gobject/tests/value.c @@ -225,7 +225,7 @@ test_valuearray_basic (void) GValueArray *a2; GValue v = G_VALUE_INIT; GValue *p; - gint i; + guint i; a = g_value_array_new (20); From cc7540909ff4a4aa09b1b0b661431276c29f3458 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Mon, 16 Nov 2020 18:01:46 +0100 Subject: [PATCH 2/6] Fix signedness warning in gobject/gtype.c:iface_node_has_available_offset_L() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) | ^~ --- gobject/gtype.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gobject/gtype.c b/gobject/gtype.c index f83c1caee..0c530ec9b 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -286,7 +286,7 @@ struct _IFaceEntry }; struct _IFaceEntries { - guint offset_index; + gsize offset_index; IFaceEntry entry[1]; }; @@ -577,7 +577,7 @@ lookup_iface_entry_I (IFaceEntries *entries, TypeNode *iface_node) { guint8 *offsets; - guint offset_index; + gsize offset_index; IFaceEntry *check; gsize index; IFaceEntry *entry; @@ -1280,7 +1280,7 @@ type_data_ref_U (TypeNode *node) static gboolean iface_node_has_available_offset_L (TypeNode *iface_node, - int offset, + gsize offset, int for_index) { guint8 *offsets; @@ -1299,27 +1299,29 @@ iface_node_has_available_offset_L (TypeNode *iface_node, return FALSE; } -static int +static gsize find_free_iface_offset_L (IFaceEntries *entries) { IFaceEntry *entry; TypeNode *iface_node; - int offset; + gsize offset; int i; int n_entries; n_entries = IFACE_ENTRIES_N_ENTRIES (entries); - offset = -1; + offset = 0; do { - offset++; for (i = 0; i < n_entries; i++) { entry = &entries->entry[i]; iface_node = lookup_type_node_I (entry->iface_type); if (!iface_node_has_available_offset_L (iface_node, offset, i)) - break; + { + offset++; + break; + } } } while (i != n_entries); @@ -1329,12 +1331,12 @@ find_free_iface_offset_L (IFaceEntries *entries) static void iface_node_set_offset_L (TypeNode *iface_node, - int offset, + gsize offset, int index) { guint8 *offsets, *old_offsets; - int new_size, old_size; - int i; + gsize new_size, old_size; + gsize i; old_offsets = G_ATOMIC_ARRAY_GET_LOCKED (&iface_node->_prot.offsets, guint8); if (old_offsets == NULL) From 12ec1eb062fcf3dd1abed39086995ca8a1a09ff0 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Mon, 16 Nov 2020 16:55:46 +0100 Subject: [PATCH 3/6] Fix missing initializer warning in gobject/gtypeplugin.c:g_type_plugin_get_type() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gobject/gtypeplugin.c: In function ‘g_type_plugin_get_type’: gobject/gtypeplugin.c:91:7: error: missing initializer for field ‘class_init’ of ‘GTypeInfo’ {aka ‘const struct _GTypeInfo’} 91 | }; | ^ In file included from gobject/gtypeplugin.h:24, from gobject/gtypeplugin.c:20: gobject/gtype.h:1053:26: note: ‘class_init’ declared here 1053 | GClassInitFunc class_init; | ^~~~~~~~~~ --- gobject/gtypeplugin.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gobject/gtypeplugin.c b/gobject/gtypeplugin.c index d5007f1d3..eba85151d 100644 --- a/gobject/gtypeplugin.c +++ b/gobject/gtypeplugin.c @@ -85,9 +85,16 @@ g_type_plugin_get_type (void) if (!type_plugin_type) { const GTypeInfo type_plugin_info = { - sizeof (GTypePluginClass), - NULL, /* base_init */ - NULL, /* base_finalize */ + sizeof (GTypePluginClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + 0, /* class_init */ + NULL, /* class_destroy */ + NULL, /* class_data */ + 0, /* instance_size */ + 0, /* n_preallocs */ + NULL, /* instance_init */ + NULL, /* value_table */ }; type_plugin_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GTypePlugin"), &type_plugin_info, 0); From dd16d1e879a6a9238d1d8d11f04664faf03cc8ad Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Mon, 16 Nov 2020 17:10:35 +0100 Subject: [PATCH 4/6] Fix missing initializer warning in gobject/gtypemodule.c:g_type_module_get_type() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gobject/gtypemodule.c: In function ‘g_type_module_get_type’: gobject/gtypemodule.c:154:7: error: missing initializer for field ‘value_table’ of ‘GTypeInfo’ {aka ‘const struct _GTypeInfo’} 154 | }; | ^ In file included from gobject/gtypeplugin.h:24, from gobject/gtypemodule.c:22: gobject/gtype.h:1063:26: note: ‘value_table’ declared here 1063 | const GTypeValueTable *value_table; | ^~~~~~~~~~~ --- gobject/gtypemodule.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c index 4ecaf8c88..dcbd73467 100644 --- a/gobject/gtypemodule.c +++ b/gobject/gtypemodule.c @@ -151,6 +151,7 @@ g_type_module_get_type (void) sizeof (GTypeModule), 0, /* n_preallocs */ NULL, /* instance_init */ + NULL, /* value_table */ }; const GInterfaceInfo iface_info = { (GInterfaceInitFunc) g_type_module_iface_init, From 34cb2255435a3973522c7ad820fb53148cd2e652 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Mon, 16 Nov 2020 17:18:07 +0100 Subject: [PATCH 5/6] Fix missing initializer warning in gobject/gparam.c:g_param_type_register_static() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gobject/gparam.c: In function ‘g_param_type_register_static’: gobject/gparam.c:1434:3: error: missing initializer for field ‘value_table’ of ‘GTypeInfo’ {aka ‘struct _GTypeInfo’} 1434 | }; | ^ In file included from gobject/gvalue.h:26, from gobject/gparam.h:26, from gobject/gparam.c:26: gobject/gtype.h:1063:26: note: ‘value_table’ declared here 1063 | const GTypeValueTable *value_table; | ^~~~~~~~~~~ --- gobject/gparam.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gobject/gparam.c b/gobject/gparam.c index f2bc1a051..0fc673e98 100644 --- a/gobject/gparam.c +++ b/gobject/gparam.c @@ -1431,6 +1431,7 @@ g_param_type_register_static (const gchar *name, 0, /* instance_size */ 16, /* n_preallocs */ NULL, /* instance_init */ + NULL, /* value_table */ }; ParamSpecClassInfo *cinfo; From 8fb696e00337670a822727c7c4f8c032c6088043 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Mon, 16 Nov 2020 17:46:01 +0100 Subject: [PATCH 6/6] Fix missing initializer warning in gobject/tests/dynamictests.c:test_module_get_type() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gobject/tests/dynamictests.c: In function ‘test_module_get_type’: gobject/tests/dynamictests.c:97:7: error: missing initializer for field ‘value_table’ of ‘GTypeInfo’ {aka ‘const struct _GTypeInfo’} 97 | }; | ^ In file included from gobject/gobject.h:24, from gobject/gbinding.h:29, from glib/glib-object.h:22, from gobject/tests/dynamictests.c:23: gobject/gtype.h:1063:26: note: ‘value_table’ declared here 1063 | const GTypeValueTable *value_table; | ^~~~~~~~~~~ --- gobject/tests/dynamictests.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gobject/tests/dynamictests.c b/gobject/tests/dynamictests.c index 7a9e9e487..06e1e01c1 100644 --- a/gobject/tests/dynamictests.c +++ b/gobject/tests/dynamictests.c @@ -93,7 +93,8 @@ static GType test_module_get_type (void) NULL, sizeof (TestModule), 0, - (GInstanceInitFunc)NULL + (GInstanceInitFunc)NULL, + NULL, }; object_type = g_type_register_static (G_TYPE_TYPE_MODULE, "TestModule", &object_info, 0); }