[tor-commits] [tor/release-0.4.0] Fix another time_t/long warning for 31343.

[teor at torproject.org]

commit 878f4409015f741c7075d0ccf3da794a6f313302
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 8 09:38:03 2019 -0400

    Fix another time_t/long warning for 31343.
---
 src/or/routerlist.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f73ec9baa..f3b298006 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5443,7 +5443,7 @@ int
 router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
 {
   time_t r1pub, r2pub;
-  long time_difference;
+  time_t time_difference;
   tor_assert(r1 && r2);
 
   /* r1 should be the one that was published first. */
@@ -5506,7 +5506,9 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
    * give or take some slop? */
   r1pub = r1->cache_info.published_on;
   r2pub = r2->cache_info.published_on;
-  time_difference = labs(r2->uptime - (r1->uptime + (r2pub - r1pub)));
+  time_difference = r2->uptime - (r1->uptime + (r2pub - r1pub));
+  if (time_difference < 0)
+    time_difference = - time_difference;
   if (time_difference > ROUTER_ALLOW_UPTIME_DRIFT &&
       time_difference > r1->uptime * .05 &&
       time_difference > r2->uptime * .05)
@@ -5816,4 +5818,3 @@ refresh_all_country_info(void)
 
   nodelist_refresh_countries();
 }
-