[glib: 25/25] Merge branch 'fix-warnings-glib' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit c8692fffe0723aee2bc6710590b5e70ef841b5cc
Merge: 10278fd80 fad04d2e1
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Mar 19 11:02:38 2019 +0000

    Merge branch 'fix-warnings-glib' into 'master'
    
    Fix warnings glib
    
    See merge request GNOME/glib!680

 glib/ghash.c            | 28 ++++++++---------
 glib/giochannel.c       | 25 ++++++++-------
 glib/giounix.c          |  3 +-
 glib/glib-unix.c        |  2 +-
 glib/gmain.c            | 20 +++++++-----
 glib/gmappedfile.c      |  2 +-
 glib/gmarkup.c          |  6 ++--
 glib/goption.c          | 14 ++++-----
 glib/gprimes.c          |  2 +-
 glib/gquark.c           |  2 +-
 glib/gscanner.c         |  1 +
 glib/gslice.c           |  5 ++-
 glib/gstrfuncs.c        |  3 +-
 glib/gstring.c          | 82 ++++++++++++++++++++++++++++++-------------------
 glib/gtester.c          |  2 +-
 glib/gtestutils.c       |  2 +-
 glib/gthread-posix.c    |  2 +-
 glib/gthreadpool.c      | 16 +++++-----
 glib/gtimezone.c        | 62 +++++++++++++++++++++----------------
 glib/gvariant-core.c    |  2 +-
 glib/gvariant-parser.c  | 22 +++++++------
 glib/gvariant.c         | 27 ++++++++--------
 glib/gvarianttypeinfo.c | 12 ++++----
 glib/tests/hash.c       |  8 ++---
 meson.build             |  2 ++
 25 files changed, 202 insertions(+), 150 deletions(-)
---