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)
This commit is contained in:
Nick Mathewson 2016-11-21 17:19:29 -05:00
parent af1918d289
commit 4689096ed1

View File

@ -1350,10 +1350,9 @@ entry_guard_succeeded(guard_selection_t *gs,
/** /**
* Called by the circuit building module when a circuit has succeeded: * 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 * 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 * not working, and advances the state of the guard module.
* bug or inconsistency; 0 on success.
*/ */
int void
entry_guard_failed(guard_selection_t *gs, entry_guard_failed(guard_selection_t *gs,
circuit_guard_state_t **guard_state_p) circuit_guard_state_t **guard_state_p)
{ {
@ -1361,16 +1360,17 @@ entry_guard_failed(guard_selection_t *gs,
return; return;
if (BUG(*guard_state_p == NULL)) if (BUG(*guard_state_p == NULL))
return -1; return;
entry_guard_t *guard = entry_guard_handle_get((*guard_state_p)->guard); entry_guard_t *guard = entry_guard_handle_get((*guard_state_p)->guard);
if (! guard) if (! guard)
return -1; return;
entry_guards_note_guard_failure(gs, guard); entry_guards_note_guard_failure(gs, guard);
(*guard_state_p)->state = GUARD_CIRC_STATE_DEAD; (*guard_state_p)->state = GUARD_CIRC_STATE_DEAD;
(*guard_state_p)->state_set_at = approx_time(); (*guard_state_p)->state_set_at = approx_time();
}
/** /**
* Run the entry_guard_failed() function on every circuit that is * Run the entry_guard_failed() function on every circuit that is