From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 Mar 2015 11:12:41 +0000 (+0100)
Subject: only declare rv when it is used in destination_from_socket. Fixes 15151
X-Git-Tag: tor-0.2.6.4-rc~8^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d926d0147af8c632fe389e770c5832009f2ddc0;p=thirdparty%2Ftor.git

only declare rv when it is used in destination_from_socket. Fixes 15151
---

diff --git a/changes/bug15151 b/changes/bug15151
new file mode 100644
index 0000000000..b9c3061554
--- /dev/null
+++ b/changes/bug15151
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+    - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on
+      0.2.6.2-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 3c817decfb..e6dfc634e9 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1598,7 +1598,6 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req)
   struct sockaddr_storage orig_dst;
   socklen_t orig_dst_len = sizeof(orig_dst);
   tor_addr_t addr;
-  int rv;
 
 #ifdef TRANS_TRPOXY
   if (options->TransProxyType_parsed == TPT_TPROXY) {
@@ -1613,6 +1612,7 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req)
 #endif
 
 #ifdef TRANS_NETFILTER
+  int rv = -1;
   switch (ENTRY_TO_CONN(conn)->socket_family) {
 #ifdef TRANS_NETFILTER_IPV4
     case AF_INET: