Commit f76cdc1a authored by Roger Dingledine's avatar Roger Dingledine
Browse files

misc small fixes 


svn:r13403
parent c054f90f

src/common/container.c

+1 −1
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ digestmap_size(const digestmap_t *map) 
  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

src/or/dirserv.c

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ dirserv_load_fingerprint_file(void) 
      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 @@ dirserv_get_networkstatus_v2_fingerprints(smartlist_t *result, 
    }

    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);

src/or/dirvote.c

+2 −1
Original line number Diff line number Diff line
@@ -1668,7 +1668,8 @@ dirvote_compute_consensus(void) 
  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;

  }

src/or/relay.c

+1 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ connection_edge_consider_sending_sendme(edge_connection_t *conn) 
    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 */

    }

  }