[or-cvs] [tor/master 1/5] Don't use "try" as an identifier

[nickm at torproject.org]

Author: valerino <valerino at te4i.com>
Date: Thu, 20 May 2010 22:50:37 -0400
Subject: Don't use "try" as an identifier
Commit: afe58cfa890ca90d9d3a54e8bbea834ec3061f5e

C allows try, but some windows CE headers like to redefine 'try' to be
a reserved word.
---
 src/or/circuitbuild.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 233d60f..fff56f0 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -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
      * at least one predicted exit port. */
 
-    int try;
+    int attempt;
     smartlist_t *needed_ports, *supporting, *use;
 
     if (best_support == -1) {
@@ -2347,13 +2347,13 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime,
     supporting = smartlist_create();
     use = smartlist_create();
     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,
        * then if there are none, pick from any that support exiting. */
       for (i = 0; i < smartlist_len(dir->routers); i++) {
         router = smartlist_get(dir->routers, i);
         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.",
 //                 try, router->nickname);
           smartlist_add(supporting, router);
-- 
1.6.5