[or-cvs] r13403: misc small fixes (in tor/trunk/src: common or)

[arma at seul.org]

Author: arma
Date: 2008-02-06 07:46:46 -0500 (Wed, 06 Feb 2008)
New Revision: 13403

Modified:
   tor/trunk/src/common/container.c
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/dirvote.c
   tor/trunk/src/or/relay.c
Log:
misc small fixes


Modified: tor/trunk/src/common/container.c
===================================================================
--- tor/trunk/src/common/container.c	2008-02-06 12:46:17 UTC (rev 13402)
+++ tor/trunk/src/common/container.c	2008-02-06 12:46:46 UTC (rev 13403)
@@ -1174,7 +1174,7 @@
   return HT_SIZE(&map->head);
 }
 
-/** declare a function called <b>funcname</b> that acts as a find_nth_XXX
+/** Declare a function called <b>funcname</b> that acts as a find_nth_FOO
  * function for an array of type <b>elt_t</b>*.
  *
  * NOTE: The implementation kind of sucks: It's O(n log n), whereas finding

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2008-02-06 12:46:17 UTC (rev 13402)
+++ tor/trunk/src/or/dirserv.c	2008-02-06 12:46:46 UTC (rev 13403)
@@ -204,7 +204,7 @@
       tor_free(fname);
       return -1;
     } else {
-      log_info(LD_FS, "Cannot open fingerprint file '%s'. Returning.", fname);
+      log_info(LD_FS, "Cannot open fingerprint file '%s'. That's ok.", fname);
       tor_free(fname);
       return 0;
     }
@@ -2517,7 +2517,7 @@
     }
     smartlist_sort_digests(result);
     if (smartlist_len(result) == 0)
-      log_warn(LD_DIRSERV,
+      log_info(LD_DIRSERV,
                "Client requested 'all' network status objects; we have none.");
   } else if (!strcmpstart(key, "fp/")) {
     dir_split_resource_into_fingerprints(key+3, result, NULL, 1, 1);

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2008-02-06 12:46:17 UTC (rev 13402)
+++ tor/trunk/src/or/dirvote.c	2008-02-06 12:46:46 UTC (rev 13403)
@@ -1668,7 +1668,8 @@
   n_voters = get_n_authorities(V3_AUTHORITY);
   n_votes = smartlist_len(pending_vote_list);
   if (n_votes <= n_voters/2) {
-    log_warn(LD_DIR, "We don't have enough votes to generate a consensus.");
+    log_warn(LD_DIR, "We don't have enough votes to generate a consensus: "
+             "%d of %d", n_votes, n_voters/2);
     goto err;
   }
 

Modified: tor/trunk/src/or/relay.c
===================================================================
--- tor/trunk/src/or/relay.c	2008-02-06 12:46:17 UTC (rev 13402)
+++ tor/trunk/src/or/relay.c	2008-02-06 12:46:46 UTC (rev 13403)
@@ -1375,7 +1375,7 @@
     conn->deliver_window += STREAMWINDOW_INCREMENT;
     if (connection_edge_send_command(conn, RELAY_COMMAND_SENDME,
                                      NULL, 0) < 0) {
-      log_warn(LD_APP,"connection_edge_send_command failed. Returning.");
+      log_warn(LD_APP,"connection_edge_send_command failed. Skipping.");
       return; /* the circuit's closed, don't continue */
     }
   }