Merge branch 'coverity-return-values' into 'master'

Fix minor Coverity return value warnings

See merge request GNOME/glib!1748

2 files changed, 6 insertions, 3 deletions

diff --git a/fuzzing/driver.c b/fuzzing/driver.c
index 99e965ba6..f6d2396db 100644
--- a/fuzzing/driver.c
+++ b/fuzzing/driver.c
@@ -10,6 +10,7 @@ int
 main (int argc, char **argv)
 {
   FILE *f;
+  long tell_result;
   size_t n_read, len;
   unsigned char *buf;
 
@@ -19,7 +20,9 @@ main (int argc, char **argv)
   f = fopen (argv[1], "r");
   assert (f);
   fseek (f, 0, SEEK_END);
-  len = ftell (f);
+  tell_result = ftell (f);
+  assert (tell_result >= 0);
+  len = (size_t) tell_result;
   fseek (f, 0, SEEK_SET);
   buf = (unsigned char*) malloc (len);
   n_read = fread (buf, 1, len, f);
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 3b03e9831..974785a44 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -1297,8 +1297,8 @@ rm_rf (const gchar *path)
   dir = g_dir_open (path, 0, NULL);
   if (dir == NULL)
     {
-      /* Assume it’s a file. */
-      g_remove (path);
+      /* Assume it’s a file. Ignore failure. */
+      (void) g_remove (path);
       return;
     }