[glib: 8/8] Merge branch 'fix_more_warnings' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit 9dac3ff49899ef6cc276d729cb5011e3e872ec69
Merge: e0bd609f7 eafc764bb
Author: Sebastian Dröge <slomo coaxion net>
Date:   Mon Apr 5 10:42:33 2021 +0000

    Merge branch 'fix_more_warnings' into 'master'
    
    Fix more warnings
    
    See merge request GNOME/glib!1957

 gio/giomodule.c              |  6 ++++--
 gio/gresource-tool.c         |  9 +++++----
 gio/gsettings-tool.c         | 15 ++++++++++-----
 gio/gunixsocketaddress.c     |  3 ++-
 gio/tests/contenttype.c      |  2 +-
 gio/tests/contexts.c         |  7 ++++---
 gio/tests/converter-stream.c |  2 +-
 7 files changed, 27 insertions(+), 17 deletions(-)
---