From 4fd9880540720803ae361067c75c19df37a8392b Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Tue, 16 Sep 2008 10:26:15 +0000
Subject: give rend_client_desc_here a slightly more accurate name

svn:r16916
---
 src/or/connection.c | 2 +-
 src/or/directory.c  | 4 ++--
 src/or/or.h         | 2 +-
 src/or/rendclient.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/or')

diff --git a/src/or/connection.c b/src/or/connection.c
index 6aa5f8588..6a34694de 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -528,7 +528,7 @@ connection_about_to_close_connection(connection_t *conn)
          * descriptors; if the response is empty or the descriptor is
          * unusable, close pending connections (unless a v2 request is
          * still in progress). */
-        rend_client_desc_here(dir_conn->rend_query, 0);
+        rend_client_desc_trynow(dir_conn->rend_query, 0);
       }
       /* If we were trying to fetch a v2 rend desc and did not succeed,
        * retry as needed. (If a fetch is successful, the connection state
diff --git a/src/or/directory.c b/src/or/directory.c
index c75fe2da0..80e0ff78e 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1892,7 +1892,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
         } else {
           /* success. notify pending connections about this. */
           conn->_base.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC;
-          rend_client_desc_here(conn->rend_query, -1);
+          rend_client_desc_trynow(conn->rend_query, -1);
         }
         break;
       case 404:
@@ -1938,7 +1938,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
             log_info(LD_REND, "Successfully fetched v2 rendezvous "
                      "descriptor.");
             conn->_base.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC;
-            rend_client_desc_here(conn->rend_query, -1);
+            rend_client_desc_trynow(conn->rend_query, -1);
             break;
         }
         break;
diff --git a/src/or/or.h b/src/or/or.h
index e2a0d871b..c14b08f4d 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3842,7 +3842,7 @@ int rend_client_rendezvous_acked(origin_circuit_t *circ, const char *request,
                                  size_t request_len);
 int rend_client_receive_rendezvous(origin_circuit_t *circ, const char *request,
                                    size_t request_len);
-void rend_client_desc_here(const char *query, int rend_version);
+void rend_client_desc_trynow(const char *query, int rend_version);
 
 extend_info_t *rend_client_get_random_intro(const char *query);
 
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 46a49bed9..7623831d5 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -463,7 +463,7 @@ rend_client_refetch_v2_renddesc(const char *query)
                     "service directories to fetch descriptors, because "
                     "we already tried them all unsuccessfully.");
   /* Close pending connections (unless a v0 request is still going on). */
-  rend_client_desc_here(query, 2);
+  rend_client_desc_trynow(query, 2);
   return;
 }
 
@@ -634,7 +634,7 @@ rend_client_receive_rendezvous(origin_circuit_t *circ, const char *request,
  * <b>rend_version</b>.
  */
 void
-rend_client_desc_here(const char *query, int rend_version)
+rend_client_desc_trynow(const char *query, int rend_version)
 {
   edge_connection_t *conn;
   rend_cache_entry_t *entry;
-- 
cgit v1.2.3