luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-28 05:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_more_warnings' into 'master'

Browse Source 
Fix more warnings

See merge request GNOME/glib!1879
This commit is contained in:
Philip Withnall 2021-01-19 10:24:22 +00:00
commit c780afdfaa
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gcontenttype.c
View File

@ -405,7 +405,9 @@ load_comment_for_mime_helper (const char *dir,
GMarkupParser parser = { GMarkupParser parser = {
mime_info_start_element, mime_info_start_element,
mime_info_end_element, mime_info_end_element,
mime_info_text mime_info_text,
NULL,
NULL
}; };
filename = g_build_filename (dir, basename, NULL); filename = g_build_filename (dir, basename, NULL);

5
gio/gdbusdaemon.c
View File

@ -210,7 +210,8 @@ is_key (const char *key_start, const char *key_end, const char *value)
{ {
gsize len = strlen (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 FALSE;
return strncmp (key_start, value, len) == 0; return strncmp (key_start, value, len) == 0;
@ -360,7 +361,7 @@ match_new (const char *str)
MatchElement element; MatchElement element;
gboolean eavesdrop; gboolean eavesdrop;
GDBusMessageType type; GDBusMessageType type;
int i; gsize i;
eavesdrop = FALSE; eavesdrop = FALSE;
type = G_DBUS_MESSAGE_TYPE_INVALID; type = G_DBUS_MESSAGE_TYPE_INVALID;

15
gio/gdesktopappinfo.c
View File

@ -4143,7 +4143,7 @@ get_list_of_mimetypes (const gchar *content_type,
if (include_fallback) if (include_fallback)
{ {
gint i; guint i;
/* Iterate the array as we grow it, until we have nothing more to add */ /* Iterate the array as we grow it, until we have nothing more to add */
for (i = 0; i < array->len; i++) for (i = 0; i < array->len; i++)
@ -4174,7 +4174,7 @@ g_desktop_app_info_get_desktop_ids_for_content_type (const gchar *content_type,
{ {
GPtrArray *hits, *blocklist; GPtrArray *hits, *blocklist;
gchar **types; gchar **types;
gint i, j; guint i, j;
hits = g_ptr_array_new (); hits = g_ptr_array_new ();
blocklist = g_ptr_array_new (); blocklist = g_ptr_array_new ();
@ -4372,7 +4372,7 @@ g_app_info_get_default_for_type (const char *content_type,
GPtrArray *results; GPtrArray *results;
GAppInfo *info; GAppInfo *info;
gchar **types; gchar **types;
gint i, j, k; guint i, j, k;
g_return_val_if_fail (content_type != NULL, NULL); g_return_val_if_fail (content_type != NULL, NULL);
@ -4477,7 +4477,7 @@ g_desktop_app_info_get_implementations (const gchar *interface)
{ {
GList *result = NULL; GList *result = NULL;
GList **ptr; GList **ptr;
gint i; guint i;
desktop_file_dirs_lock (); desktop_file_dirs_lock ();
@ -4540,6 +4540,7 @@ g_desktop_app_info_search (const gchar *search_string)
gint n_categories = 0; gint n_categories = 0;
gint start_of_category; gint start_of_category;
gint i, j; gint i, j;
guint k;
search_tokens = g_str_tokenize_and_fold (search_string, NULL, NULL); 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 (); 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++) 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_token_results (j == 0);
} }
merge_directory_results (); merge_directory_results ();
@ -4619,7 +4620,7 @@ g_app_info_get_all (void)
GHashTable *apps; GHashTable *apps;
GHashTableIter iter; GHashTableIter iter;
gpointer value; gpointer value;
int i; guint i;
GList *infos; GList *infos;
apps = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); apps = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);

1
gio/gpollableutils.c
View File

@ -89,6 +89,7 @@ static GSourceFuncs pollable_source_funcs =
pollable_source_dispatch, pollable_source_dispatch,
pollable_source_finalize, pollable_source_finalize,
(GSourceFunc)pollable_source_closure_callback, (GSourceFunc)pollable_source_closure_callback,
NULL,
}; };
/** /**