From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 30 Sep 2008 13:59:12 +0000 (+0000)
Subject: Switch a should-benee-dless check for an assert.
X-Git-Tag: tor-0.2.1.7-alpha~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccede03cc045ae87b49bdcf3caaa943f7c07addb;p=thirdparty%2Ftor.git

Switch a should-benee-dless check for an assert.

svn:r17018
---

diff --git a/src/or/rephist.c b/src/or/rephist.c
index 5d9ce14a01..088635cda4 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -293,13 +293,15 @@ rep_hist_note_router_reachable(const char *id, time_t when)
   int was_in_run = 1;
   char tbuf[ISO_TIME_LEN+1];
 
+  tor_assert(hist);
+
   if (!started_tracking_stability)
     started_tracking_stability = time(NULL);
-  if (hist && !hist->start_of_run) {
+  if (!hist->start_of_run) {
     hist->start_of_run = when;
     was_in_run = 0;
   }
-  if (hist && hist->start_of_downtime) {
+  if (hist->start_of_downtime) {
     long down_length;
 
     format_local_iso_time(tbuf, hist->start_of_downtime);
@@ -332,7 +334,9 @@ rep_hist_note_router_unreachable(const char *id, time_t when)
   int was_running = 0;
   if (!started_tracking_stability)
     started_tracking_stability = time(NULL);
-  if (hist && hist->start_of_run) {
+
+  tor_assert(hist);
+  if (hist->start_of_run) {
     /*XXXX We could treat failed connections differently from failed
      * connect attempts. */
     long run_length = when - hist->start_of_run;
@@ -350,7 +354,7 @@ rep_hist_note_router_unreachable(const char *id, time_t when)
              hex_str(id, DIGEST_LEN), tbuf, hist->weighted_uptime,
              hist->total_weighted_time);
   }
-  if (hist && !hist->start_of_downtime) {
+  if (!hist->start_of_downtime) {
     hist->start_of_downtime = when;
 
     if (!was_running)