[or-cvs] [tor/master 3/3] Woops, forgot the second warn.

[nickm at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Wed, 3 Mar 2010 21:02:01 -0800
Subject: Woops, forgot the second warn.
Commit: 2b5e1d363640e34ec803044f0f8d086dfdd40a6b

Also, differentiate the two log messages.
---
 src/or/routerlist.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 392588c..a67703c 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1576,10 +1576,10 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
              rule == WEIGHT_FOR_MID ||
              rule == WEIGHT_FOR_DIR);
 
-  if (!sl || smartlist_len(sl) == 0) {
+  if (smartlist_len(sl) == 0) {
     log_info(LD_CIRC,
-             "Empty routerlist passed in to node selection for rule %d",
-             rule);
+             "Empty routerlist passed in to consensus weight node "
+             "selection for rule %d", rule);
     return NULL;
   }
 
@@ -1783,9 +1783,9 @@ smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule,
              rule == WEIGHT_FOR_EXIT ||
              rule == WEIGHT_FOR_GUARD);
 
-  if (!sl || smartlist_len(sl) == 0) {
-    log_warn(LD_CIRC,
-             "Empty routerlist passed in to node selection for rule %d",
+  if (smartlist_len(sl) == 0) {
+    log_info(LD_CIRC,
+             "Empty routerlist passed in to old node selection for rule %d",
              rule);
     return NULL;
   }
-- 
1.6.5