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

[Philip Withnall <pwithnall src gnome org>]

commit 332bc1708e178e983dc44af689024bd22d5ab1d9
Merge: ddef9ba2f e7c1b2a48
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Nov 14 11:44:45 2020 +0000

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

 glib/tests/gvariant.c            |  6 +++---
 glib/tests/mainloop.c            | 26 +++++++++++++++++++-------
 glib/tests/markup-collect.c      | 21 +++++++++++----------
 glib/tests/markup-subparser.c    | 26 +++++++++++++++-----------
 glib/tests/option-context.c      | 19 ++++++++++---------
 glib/tests/spawn-multithreaded.c | 18 +++++++++---------
 glib/tests/tree.c                |  2 +-
 7 files changed, 68 insertions(+), 50 deletions(-)
---