diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-12 21:12:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-12 21:12:17 -0400 |
| commit | 5634e0330283e76aa4e7411ee6d8bef6f71d01a6 (patch) | |
| tree | 3135e0a65291e9e0cad523203aa72d45727d495b /src | |
| parent | 22ab997e8319fd0287c16ab8300d1bf69689f458 (diff) | |
| download | tor-5634e0330283e76aa4e7411ee6d8bef6f71d01a6.tar.gz tor-5634e0330283e76aa4e7411ee6d8bef6f71d01a6.zip | |
Clean up a couple more bug1138 issues mentioned by roger on code review
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/directory.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 388410c8af..f584bc3858 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -70,7 +70,7 @@ static void connection_dir_download_routerdesc_failed(dir_connection_t *conn); static void connection_dir_bridge_routerdesc_failed(dir_connection_t *conn); static void connection_dir_download_cert_failed( dir_connection_t *conn, int status_code); -static void connection_dir_retry_bridges(smartlist_t* descs); +static void connection_dir_retry_bridges(smartlist_t *descs); static void dir_networkstatus_download_failed(smartlist_t *failed, int status_code); static void dir_routerdesc_download_failed(smartlist_t *failed, @@ -653,7 +653,7 @@ connection_dir_download_networkstatus_failed(dir_connection_t *conn, * listed in <b>failed</b>. */ static void -connection_dir_retry_bridges(smartlist_t* descs) +connection_dir_retry_bridges(smartlist_t *descs) { char digest[DIGEST_LEN]; SMARTLIST_FOREACH(descs, const char *, cp, @@ -693,7 +693,6 @@ connection_dir_bridge_routerdesc_failed(dir_connection_t *conn) { smartlist_t *which = NULL; - tor_assert(conn->requested_resource); /* Requests for bridge descriptors are in the form 'fp/', so ignore anything else. */ if (!conn->requested_resource || strcmpstart(conn->requested_resource,"fp/")) |