[tor-commits] [tor/master] scan-build: circuit_cpath_support_ntor had a dead initialization

[nickm@xxxxxxxxxxxxxx]

commit d1be2f5cf8afc7d94f4c69081897d7ea3da71298
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Apr 18 20:29:51 2014 -0400

    scan-build: circuit_cpath_support_ntor had a dead initialization
    
    We were initializing cpath twice, which doesn't make sense.
---
 src/or/circuitbuild.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 98fef4c..6bdbead 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -277,9 +277,9 @@ circuit_rep_hist_note_result(origin_circuit_t *circ)
 static int
 circuit_cpath_supports_ntor(const origin_circuit_t *circ)
 {
-  crypt_path_t *head = circ->cpath, *cpath = circ->cpath;
+  crypt_path_t *head, *cpath;
 
-  cpath = head;
+  cpath = head = circ->cpath;
   do {
     if (cpath->extend_info &&
         !tor_mem_is_zero(



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits