[glib: 1/7] glib: Various minor scan-build fixes

[Nirbheek Chauhan <nirbheekc src gnome org>]

commit 18a232be89c05d8eadd99c637418a05b016f777d
Author: Philip Withnall <withnall endlessm com>
Date:   Wed May 1 12:53:56 2019 +0100

    glib: Various minor scan-build fixes
    
    These squash various warnings from `scan-build`. None of them are
    legitimate bugs, but some of them do improve code readability a bit.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>
    
    Helps: #1767

 gio/gcredentials.c        | 3 +--
 glib/gchecksum.c          | 1 +
 glib/gkeyfile.c           | 1 +
 glib/gmain.c              | 1 +
 glib/gmarkup.c            | 6 ++++--
 glib/gmessages.c          | 2 +-
 glib/grand.c              | 3 +--
 glib/gspawn.c             | 2 --
 glib/gtestutils.c         | 3 +++
 glib/gunidecomp.c         | 1 +
 glib/gvariant-parser.c    | 2 ++
 glib/tests/bookmarkfile.c | 1 +
 12 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/gio/gcredentials.c b/gio/gcredentials.c
index 57a39f2a2..c350e3c88 100644
--- a/gio/gcredentials.c
+++ b/gio/gcredentials.c
@@ -542,13 +542,12 @@ g_credentials_set_unix_user (GCredentials    *credentials,
                              uid_t            uid,
                              GError         **error)
 {
-  gboolean ret;
+  gboolean ret = FALSE;
 
   g_return_val_if_fail (G_IS_CREDENTIALS (credentials), FALSE);
   g_return_val_if_fail (uid != -1, FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-  ret = FALSE;
 #if G_CREDENTIALS_USE_LINUX_UCRED
   credentials->native.uid = uid;
   ret = TRUE;
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index 1ad21fff8..f8a3f9ab8 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -1344,6 +1344,7 @@ sha512_sum_close (Sha512sum *sha512)
   memset (pad + pad_len, 0x00, zeros / 8);
   pad_len += zeros / 8;
   zeros = zeros % 8;
+  (void) zeros;  /* don’t care about the dead store */
 
   /* put message bit length at the end of padding */
   PUT_UINT64 (sha512->data_len[1], pad, pad_len);
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index e486f6928..dc80ce5d4 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -3317,6 +3317,7 @@ g_key_file_set_key_comment (GKeyFile     *key_file,
   pair->value = g_key_file_parse_comment_as_value (key_file, comment);
   
   key_node = g_list_insert (key_node, pair, 1);
+  (void) key_node;
 
   return TRUE;
 }
diff --git a/glib/gmain.c b/glib/gmain.c
index af979c8b8..ae86d5a2c 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1040,6 +1040,7 @@ find_source_list_for_priority (GMainContext *context,
        * context->source_lists without having to walk the list again.
        */
       last = g_list_append (last, source_list);
+      (void) last;
     }
   return source_list;
 }
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 5b70cef8d..945f40695 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -2917,7 +2917,6 @@ g_markup_collect_attributes (const gchar         *element_name,
 failure:
   /* replay the above to free allocations */
   type = first_type;
-  attr = first_attr;
 
   va_start (ap, first_attr);
   while (type != G_MARKUP_COLLECT_INVALID)
@@ -2952,7 +2951,10 @@ failure:
 
       type = va_arg (ap, GMarkupCollectType);
       if (type != G_MARKUP_COLLECT_INVALID)
-        attr = va_arg (ap, const char *);
+        {
+          attr = va_arg (ap, const char *);
+          (void) attr;
+        }
     }
   va_end (ap);
 
diff --git a/glib/gmessages.c b/glib/gmessages.c
index bb1ab8f84..ea3f6c1e9 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -1313,7 +1313,7 @@ g_logv (const gchar   *log_domain,
     {
       GLogLevelFlags test_level;
 
-      test_level = 1 << i;
+      test_level = 1L << i;
       if (log_level & test_level)
        {
          GLogDomain *domain;
diff --git a/glib/grand.c b/glib/grand.c
index b5b1b71f6..cf935fc18 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -502,7 +502,7 @@ g_rand_int_range (GRand  *rand,
                   gint32  end)
 {
   guint32 dist = end - begin;
-  guint32 random;
+  guint32 random = 0;
 
   g_return_val_if_fail (rand != NULL, begin);
   g_return_val_if_fail (end > begin, begin);
@@ -563,7 +563,6 @@ g_rand_int_range (GRand  *rand,
        }
       break;
     default:
-      random = 0;              /* Quiet GCC */
       g_assert_not_reached ();
     }      
  
diff --git a/glib/gspawn.c b/glib/gspawn.c
index 3f6d700c1..7dd4bdcbb 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -435,8 +435,6 @@ g_spawn_sync (const gchar          *working_directory,
          (outpipe >= 0 ||
           errpipe >= 0))
     {
-      ret = 0;
-          
       FD_ZERO (&fds);
       if (outpipe >= 0)
         FD_SET (outpipe, &fds);
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index dd789482f..5c2a55896 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -3694,6 +3694,9 @@ g_test_trap_assertions (const char     *domain,
       g_assertion_message (domain, file, line, func, msg);
       g_free (msg);
     }
+
+  (void) logged_child_output;  /* shut up scan-build about the final unread assignment */
+
   g_free (process_id);
 }
 
diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 19ecdae36..32addc985 100644
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -443,6 +443,7 @@ _g_utf8_normalize_wc (const gchar    *str,
     {
       g_unicode_canonical_ordering (wc_buffer + last_start, n_wc - last_start);
       last_start = n_wc;
+      (void) last_start;
     }
          
   wc_buffer[n_wc] = 0;
diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c
index 5e96c1321..bee1f47ff 100644
--- a/glib/gvariant-parser.c
+++ b/glib/gvariant-parser.c
@@ -2527,6 +2527,8 @@ g_variant_new_parsed_va (const gchar *format,
   if (*stream.stream)
     g_error ("g_variant_new_parsed: trailing text after value");
 
+  g_clear_error (&error);
+
   return result;
 }
 
diff --git a/glib/tests/bookmarkfile.c b/glib/tests/bookmarkfile.c
index cc922c0fc..d2ece45a4 100644
--- a/glib/tests/bookmarkfile.c
+++ b/glib/tests/bookmarkfile.c
@@ -175,6 +175,7 @@ test_misc (void)
                                         &error);
   g_assert_error (error, G_BOOKMARK_FILE_ERROR, G_BOOKMARK_FILE_ERROR_INVALID_VALUE);
   g_clear_error (&error);
+  g_assert_false (res);
 
   g_bookmark_file_set_mime_type (bookmark, 
                                  "file:///tmp/schedule1.ps",