From 46772fe4c3a7342180586d5025eab69828a1c5ab Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:03:25 +0100 Subject: [PATCH 01/10] Fix signedness warning in gio/gdesktopappinfo.c:get_list_of_mimetypes() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gdesktopappinfo.c: In function ‘get_list_of_mimetypes’: gio/gdesktopappinfo.c:4116:21: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 4116 | for (i = 0; i < array->len; i++) | ^ --- gio/gdesktopappinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 26e51415a..a0e8cb13d 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -4143,7 +4143,7 @@ get_list_of_mimetypes (const gchar *content_type, if (include_fallback) { - gint i; + guint i; /* Iterate the array as we grow it, until we have nothing more to add */ for (i = 0; i < array->len; i++) From daa0e0b76b9b50005fc5fda628bee1cc98a3d1c5 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:05:28 +0100 Subject: [PATCH 02/10] Fix signedness warnings in gio/gdesktopappinfo.c:g_desktop_app_info_get_desktop_ids_for_content_type() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gdesktopappinfo.c: In function ‘g_desktop_app_info_get_desktop_ids_for_content_type’: gio/gdesktopappinfo.c:4154:19: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 4154 | for (j = 0; j < desktop_file_dirs->len; j++) | ^ gio/gdesktopappinfo.c:4158:17: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} [-Werror=sign-compare] 4158 | for (i = 0; i < hits->len; i++) | ^ --- gio/gdesktopappinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index a0e8cb13d..ae19e6d74 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -4174,7 +4174,7 @@ g_desktop_app_info_get_desktop_ids_for_content_type (const gchar *content_type, { GPtrArray *hits, *blocklist; gchar **types; - gint i, j; + guint i, j; hits = g_ptr_array_new (); blocklist = g_ptr_array_new (); From 554b1ff0e2098ed1d646c79c9994639fa9b8ce9c Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:07:46 +0100 Subject: [PATCH 03/10] Fix several signedness warnings in gio/gdesktopappinfo.c:g_app_info_get_default_for_type() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gdesktopappinfo.c: In function ‘g_app_info_get_default_for_type’: gio/gdesktopappinfo.c:4357:21: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 4357 | for (j = 0; j < desktop_file_dirs->len; j++) | ^ gio/gdesktopappinfo.c:4361:21: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 4361 | for (j = 0; j < desktop_file_dirs->len; j++) | ^ gio/gdesktopappinfo.c:4365:21: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 4365 | for (j = 0; j < results->len; j++) | ^ gio/gdesktopappinfo.c:4369:25: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 4369 | for (k = 0; k < desktop_file_dirs->len; k++) | ^ --- gio/gdesktopappinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index ae19e6d74..3ee1adb93 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -4372,7 +4372,7 @@ g_app_info_get_default_for_type (const char *content_type, GPtrArray *results; GAppInfo *info; gchar **types; - gint i, j, k; + guint i, j, k; g_return_val_if_fail (content_type != NULL, NULL); From 6bce33300ac4ff337fcceae44a01996777e58cec Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:09:07 +0100 Subject: [PATCH 04/10] Fix signedness warning in gio/gdesktopappinfo.c:g_desktop_app_info_get_implementations() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gdesktopappinfo.c: In function ‘g_desktop_app_info_get_implementations’: gio/gdesktopappinfo.c:4451:17: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 4451 | for (i = 0; i < desktop_file_dirs->len; i++) | ^ --- gio/gdesktopappinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 3ee1adb93..3cc453ccd 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -4477,7 +4477,7 @@ g_desktop_app_info_get_implementations (const gchar *interface) { GList *result = NULL; GList **ptr; - gint i; + guint i; desktop_file_dirs_lock (); From 9567665524843350e6b783f8692f311bf00df305 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:11:45 +0100 Subject: [PATCH 05/10] Fix signedness warning in gio/gdesktopappinfo.c:g_desktop_app_info_search() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gdesktopappinfo.c: In function ‘g_desktop_app_info_search’: gio/gdesktopappinfo.c:4517:17: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} 4517 | for (i = 0; i < desktop_file_dirs->len; i++) | ^ --- gio/gdesktopappinfo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 3cc453ccd..74fadaf97 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -4540,6 +4540,7 @@ g_desktop_app_info_search (const gchar *search_string) gint n_categories = 0; gint start_of_category; gint i, j; + guint k; search_tokens = g_str_tokenize_and_fold (search_string, NULL, NULL); @@ -4547,11 +4548,11 @@ g_desktop_app_info_search (const gchar *search_string) reset_total_search_results (); - for (i = 0; i < desktop_file_dirs->len; i++) + for (k = 0; k < desktop_file_dirs->len; k++) { for (j = 0; search_tokens[j]; j++) { - desktop_file_dir_search (g_ptr_array_index (desktop_file_dirs, i), search_tokens[j]); + desktop_file_dir_search (g_ptr_array_index (desktop_file_dirs, k), search_tokens[j]); merge_token_results (j == 0); } merge_directory_results (); From ae1eebb2e9b75484c4130472538727381e050ea2 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:13:29 +0100 Subject: [PATCH 06/10] Fix signedness warning in gio/gdesktopappinfo.c:g_app_info_get_all() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gdesktopappinfo.c: In function ‘g_app_info_get_all’: gio/gdesktopappinfo.c:4597:17: error: comparison of integer expressions of different signedness: ‘int’ and ‘guint’ {aka ‘unsigned int’} 4597 | for (i = 0; i < desktop_file_dirs->len; i++) | ^ --- gio/gdesktopappinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 74fadaf97..d1b76a8a5 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -4620,7 +4620,7 @@ g_app_info_get_all (void) GHashTable *apps; GHashTableIter iter; gpointer value; - int i; + guint i; GList *infos; apps = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); From f12f00869983cdb1ff15c48156b421005cdb4d60 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:18:15 +0100 Subject: [PATCH 07/10] Fix missing initializer warning in gio/gcontenttype.c:load_comment_for_mime_helper() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gcontenttype.c: In function ‘load_comment_for_mime_helper’: gio/gcontenttype.c:409:3: error: missing initializer for field ‘passthrough’ of ‘GMarkupParser’ {aka ‘struct _GMarkupParser’} 409 | }; | ^ --- gio/gcontenttype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c index 2716c8981..83075fcb6 100644 --- a/gio/gcontenttype.c +++ b/gio/gcontenttype.c @@ -405,7 +405,9 @@ load_comment_for_mime_helper (const char *dir, GMarkupParser parser = { mime_info_start_element, mime_info_end_element, - mime_info_text + mime_info_text, + NULL, + NULL }; filename = g_build_filename (dir, basename, NULL); From 73499dcb73923f7c320be7e12e7bd5094c79866e Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:20:34 +0100 Subject: [PATCH 08/10] Fix missing initializer warning in gio/gpollableutils.c:closure_marshal() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gpollableutils.c:92:1: error: missing initializer for field ‘closure_marshal’ of ‘GSourceFuncs’ {aka ‘struct _GSourceFuncs’} 92 | }; | ^ --- gio/gpollableutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gio/gpollableutils.c b/gio/gpollableutils.c index b77e65404..77bf82174 100644 --- a/gio/gpollableutils.c +++ b/gio/gpollableutils.c @@ -89,6 +89,7 @@ static GSourceFuncs pollable_source_funcs = pollable_source_dispatch, pollable_source_finalize, (GSourceFunc)pollable_source_closure_callback, + NULL, }; /** From 6d08c2f5ba6d5bbaf6805008d022cc0409414de3 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:23:47 +0100 Subject: [PATCH 09/10] Fix signedness warning in gio/gdbusdaemon.c:is_key() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gdbusdaemon.c: In function ‘is_key’: gio/gdbusdaemon.c:213:11: error: comparison of integer expressions of different signedness: ‘gsize’ {aka ‘long unsigned int’} and ‘long int’ 213 | if (len != key_end - key_start) | ^~ --- gio/gdbusdaemon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gio/gdbusdaemon.c b/gio/gdbusdaemon.c index 7ae55ece8..f62b5ce0e 100644 --- a/gio/gdbusdaemon.c +++ b/gio/gdbusdaemon.c @@ -210,7 +210,8 @@ is_key (const char *key_start, const char *key_end, const char *value) { gsize len = strlen (value); - if (len != key_end - key_start) + g_assert (key_end >= key_start); + if (len != (gsize) (key_end - key_start)) return FALSE; return strncmp (key_start, value, len) == 0; From f4129932916979ce90a80c68f62e18bd7b89ac95 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Tue, 17 Nov 2020 11:26:10 +0100 Subject: [PATCH 10/10] Fix signedness warning in gio/gdbusdaemon.c:match_new() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gio/gdbusdaemon.c: In function ‘match_new’: gio/gdbusdaemon.c:449:17: error: comparison of integer expressions of different signedness: ‘int’ and ‘guint’ {aka ‘unsigned int’} 449 | for (i = 0; i < elements->len; i++) | ^ --- gio/gdbusdaemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/gdbusdaemon.c b/gio/gdbusdaemon.c index f62b5ce0e..ef902d65a 100644 --- a/gio/gdbusdaemon.c +++ b/gio/gdbusdaemon.c @@ -361,7 +361,7 @@ match_new (const char *str) MatchElement element; gboolean eavesdrop; GDBusMessageType type; - int i; + gsize i; eavesdrop = FALSE; type = G_DBUS_MESSAGE_TYPE_INVALID;