From b837191fd0e897cbc5fc33874190bab8bbb83268 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 May 2007 22:15:14 +0000
Subject:  r12768@catbus:  nickm | 2007-05-16 17:25:33 -0400  Fix GCC warnings
 related to local parameters/variables getting shadowed.

svn:r10198
---
 src/or/routerparse.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/or/routerparse.c')

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 736a8b1c62..1dff041f08 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -611,7 +611,7 @@ router_parse_directory(const char *str)
   if (check_signature_token(digest, tok, declared_key, 1, "directory")<0)
     goto err;
 
-  SMARTLIST_FOREACH(tokens, directory_token_t *, tok, token_free(tok));
+  SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));
   smartlist_free(tokens);
   tokens = NULL;
 
@@ -649,7 +649,7 @@ router_parse_directory(const char *str)
  done:
   if (declared_key) crypto_free_pk_env(declared_key);
   if (tokens) {
-    SMARTLIST_FOREACH(tokens, directory_token_t *, tok, token_free(tok));
+    SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));
     smartlist_free(tokens);
   }
   return r;
@@ -707,7 +707,7 @@ router_parse_runningrouters(const char *str)
  err:
   if (declared_key) crypto_free_pk_env(declared_key);
   if (tokens) {
-    SMARTLIST_FOREACH(tokens, directory_token_t *, tok, token_free(tok));
+    SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));
     smartlist_free(tokens);
   }
   return r;
@@ -1139,7 +1139,7 @@ router_parse_entry_from_string(const char *s, const char *end,
   router = NULL;
  done:
   if (tokens) {
-    SMARTLIST_FOREACH(tokens, directory_token_t *, tok, token_free(tok));
+    SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));
     smartlist_free(tokens);
   }
   if (exit_policy_tokens) {
@@ -1254,7 +1254,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end,
   extrainfo = NULL;
  done:
   if (tokens) {
-    SMARTLIST_FOREACH(tokens, directory_token_t *, tok, token_free(tok));
+    SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));
     smartlist_free(tokens);
   }
   return extrainfo;
-- 
cgit v1.2.3-54-g00ecf