From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 19 Apr 2014 00:29:51 +0000 (-0400)
Subject: scan-build: circuit_cpath_support_ntor had a dead initialization
X-Git-Tag: tor-0.2.5.4-alpha~14^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1be2f5cf8afc7d94f4c69081897d7ea3da71298;p=thirdparty%2Ftor.git

scan-build: circuit_cpath_support_ntor had a dead initialization

We were initializing cpath twice, which doesn't make sense.
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 98fef4c142..6bdbead2eb 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(