[tor-commits] [tor/master] Fix two compile warnings when using clang

[nickm at torproject.org]

commit 473ff2656355a796761e9eb5e15b30cd853c58b6
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Mar 10 01:47:00 2011 +0100

    Fix two compile warnings when using clang
    
    Issue found by Steven Murdoch
---
 src/or/geoip.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/or/geoip.c b/src/or/geoip.c
index e5694b9..f3e0b72 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -278,6 +278,8 @@ geoip_is_loaded(void)
   return geoip_countries != NULL && geoip_entries != NULL;
 }
 
+#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu
+
 /** Entry in a map from IP address to the last time we've seen an incoming
  * connection from that IP address. Used by bridges only, to track which
  * countries have them blocked. */
@@ -413,12 +415,13 @@ geoip_note_client_seen(geoip_client_action_t action,
   lookup.ipaddr = addr;
   lookup.action = (int)action;
   ent = HT_FIND(clientmap, &client_history, &lookup);
+  tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES);
   if (ent) {
-    ent->last_seen_in_minutes = now / 60;
+    ent->last_seen_in_minutes = (unsigned)(now/60);
   } else {
     ent = tor_malloc_zero(sizeof(clientmap_entry_t));
     ent->ipaddr = addr;
-    ent->last_seen_in_minutes = now / 60;
+    ent->last_seen_in_minutes = (unsigned)(now/60);
     ent->action = (int)action;
     HT_INSERT(clientmap, &client_history, ent);
   }