summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-21 17:19:29 -0500
committerNick Mathewson <nickm@torproject.org>2016-11-30 14:42:53 -0500
commit4689096ed165e893a541b11520b347fc03e39db0 (patch)
treebe27fd2e66d82ed3688719e75d3ec9f9f8a6e179
parentaf1918d28999c2c38ace984296927d9244c7c7b1 (diff)
downloadtor-4689096ed165e893a541b11520b347fc03e39db0.tar.gz
tor-4689096ed165e893a541b11520b347fc03e39db0.zip
No need to say success/failure when recording failure; remove returnval
(We can fail at succeeding, but there's no plausible way to fail at failing)
-rw-r--r--src/or/entrynodes.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 2b6fd51116..cda554049d 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1350,10 +1350,9 @@ entry_guard_succeeded(guard_selection_t *gs,
/**
* Called by the circuit building module when a circuit has succeeded:
* informs the guards code that the guard in *<b>guard_state_p</b> is
- * not working, and advances the state of the guard module. Return -1 on
- * bug or inconsistency; 0 on success.
+ * not working, and advances the state of the guard module.
*/
-int
+void
entry_guard_failed(guard_selection_t *gs,
circuit_guard_state_t **guard_state_p)
{
@@ -1361,16 +1360,17 @@ entry_guard_failed(guard_selection_t *gs,
return;
if (BUG(*guard_state_p == NULL))
- return -1;
+ return;
entry_guard_t *guard = entry_guard_handle_get((*guard_state_p)->guard);
if (! guard)
- return -1;
+ return;
entry_guards_note_guard_failure(gs, guard);
(*guard_state_p)->state = GUARD_CIRC_STATE_DEAD;
(*guard_state_p)->state_set_at = approx_time();
+}
/**
* Run the entry_guard_failed() function on every circuit that is