Commit afe58cfa authored by valerino's avatar valerino Committed by Nick Mathewson
Browse files

Don't use "try" as an identifier

C allows try, but some windows CE headers like to redefine 'try' to be
a reserved word.
parent 9563b0d5
...@@ -2327,7 +2327,7 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime, ...@@ -2327,7 +2327,7 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime,
* possibly support any of them. Choose a router at random that satisfies * possibly support any of them. Choose a router at random that satisfies
* at least one predicted exit port. */ * at least one predicted exit port. */
int try; int attempt;
smartlist_t *needed_ports, *supporting, *use; smartlist_t *needed_ports, *supporting, *use;
if (best_support == -1) { if (best_support == -1) {
...@@ -2347,13 +2347,13 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime, ...@@ -2347,13 +2347,13 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime,
supporting = smartlist_create(); supporting = smartlist_create();
use = smartlist_create(); use = smartlist_create();
needed_ports = circuit_get_unhandled_ports(time(NULL)); needed_ports = circuit_get_unhandled_ports(time(NULL));
for (try = 0; try < 2; try++) { for (attempt = 0; attempt < 2; attempt++) {
/* try once to pick only from routers that satisfy a needed port, /* try once to pick only from routers that satisfy a needed port,
* then if there are none, pick from any that support exiting. */ * then if there are none, pick from any that support exiting. */
for (i = 0; i < smartlist_len(dir->routers); i++) { for (i = 0; i < smartlist_len(dir->routers); i++) {
router = smartlist_get(dir->routers, i); router = smartlist_get(dir->routers, i);
if (n_supported[i] != -1 && if (n_supported[i] != -1 &&
(try || router_handles_some_port(router, needed_ports))) { (attempt || router_handles_some_port(router, needed_ports))) {
// log_fn(LOG_DEBUG,"Try %d: '%s' is a possibility.", // log_fn(LOG_DEBUG,"Try %d: '%s' is a possibility.",
// try, router->nickname); // try, router->nickname);
smartlist_add(supporting, router); smartlist_add(supporting, router);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment