[tor-commits] [tor/master] No need to say success/failure when recording failure; remove returnval

[nickm at torproject.org]

commit 4689096ed165e893a541b11520b347fc03e39db0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 21 17:19:29 2016 -0500

    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)
---
 src/or/entrynodes.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 2b6fd51..cda5540 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