From: Frank Ch. Eigler <fche@redhat.com>
Date: Mon, 20 Jan 2020 19:44:15 +0000 (-0500)
Subject: PR25394 followup#2: debuginfod casting fixes
X-Git-Tag: elfutils-0.179~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09d76c1dd5e45c5512db997e52234dd2ddab8c2d;p=thirdparty%2Felfutils.git

PR25394 followup#2: debuginfod casting fixes

Buildbot still reports type warnings in time_t arithmetic.
Explicit (long)er cast pushed as obvious ... or is it? :-)
---

diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 063750897..b0299a133 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -2493,7 +2493,7 @@ thread_main_fts_source_paths (void* arg)
       bool rescan_now = false;
       if (last_rescan == 0) // at least one initial rescan is documented even for -t0
         rescan_now = true;
-      if (rescan_s > 0 && (long)now > (long)last_rescan + rescan_s)
+      if (rescan_s > 0 && (long)now > (long)(last_rescan + rescan_s))
         rescan_now = true;
       if (sigusr1 != forced_rescan_count)
         {
@@ -2636,7 +2636,7 @@ thread_main_groom (void* /*arg*/)
       bool groom_now = false;
       if (last_groom == 0) // at least one initial groom is documented even for -g0
         groom_now = true;
-      if (groom_s > 0 && (long)now > (long)last_groom + groom_s)
+      if (groom_s > 0 && (long)now > (long)(last_groom + groom_s))
         groom_now = true;
       if (sigusr2 != forced_groom_count)
         {