manually backport a5232e0c4c

8 files changed, 11 insertions, 10 deletions

diff --git a/changes/bug3208b b/changes/bug3208b
new file mode 100644
index 0000000000..5e0489b223
--- /dev/null
+++ b/changes/bug3208b
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option.
+      Fixes bug 3208.
+
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 208a9cb11b..aa845332b5 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2297,7 +2297,6 @@ entry_guards_compute_status(void)
 {
   time_t now;
   int changed = 0;
-  int severity = LOG_DEBUG;
   or_options_t *options;
   digestmap_t *reasons;
   if (! entry_guards)
@@ -2325,8 +2324,6 @@ entry_guards_compute_status(void)
   if (remove_dead_entry_guards())
     changed = 1;
 
-  severity = changed ? LOG_DEBUG : LOG_INFO;
-
   if (changed) {
     SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) {
       const char *reason = digestmap_get(reasons, entry->identity);
diff --git a/src/or/command.c b/src/or/command.c
index 9269456805..61b898cead 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -621,6 +621,7 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
 
   /* XXX maybe act on my_apparent_addr, if the source is sufficiently
    * trustworthy. */
+  (void)my_apparent_addr;
 
   if (connection_or_set_state_open(conn)<0)
     connection_mark_for_close(TO_CONN(conn));
diff --git a/src/or/control.c b/src/or/control.c
index f91afafeee..3ffe10bf2d 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2999,7 +2999,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp,
 {
   const char *status;
   char extended_buf[96];
-  int providing_reason=0;
   if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS))
     return 0;
   tor_assert(circ);
@@ -3023,7 +3022,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp,
     const char *reason_str = circuit_end_reason_to_control_string(reason_code);
     char *reason = NULL;
     size_t n=strlen(extended_buf);
-    providing_reason=1;
     if (!reason_str) {
       reason = tor_malloc(16);
       tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code);
diff --git a/src/or/directory.c b/src/or/directory.c
index 9f9b2c1577..0c849cade4 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1806,7 +1806,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
             router_get_trusteddirserver_by_digest(conn->identity_digest);
           char *rejected_hdr = http_get_header(headers,
                                                "X-Descriptor-Not-New: ");
-          int rejected = 0;
           if (rejected_hdr) {
             if (!strcmp(rejected_hdr, "Yes")) {
               log_info(LD_GENERAL,
@@ -1819,7 +1818,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
                * last descriptor, not on the published time of the last
                * descriptor.  If those are different, that's a bad thing to
                * do. -NM */
-              rejected = 1;
             }
             tor_free(rejected_hdr);
           }
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index f1381988c9..e38c210a45 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -712,7 +712,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
                      * is the same flag as votes[j]->known_flags[b]. */
     int *named_flag; /* Index of the flag "Named" for votes[j] */
     int *unnamed_flag; /* Index of the flag "Unnamed" for votes[j] */
-    int chosen_named_idx, chosen_unnamed_idx;
+    int chosen_named_idx;
 
     strmap_t *name_to_id_map = strmap_new();
     char conflict[DIGEST_LEN];
@@ -730,7 +730,6 @@ networkstatus_compute_consensus(smartlist_t *votes,
     for (i = 0; i < smartlist_len(votes); ++i)
       unnamed_flag[i] = named_flag[i] = -1;
     chosen_named_idx = smartlist_string_pos(flags, "Named");
-    chosen_unnamed_idx = smartlist_string_pos(flags, "Unnamed");
 
     /* Build the flag index. */
     SMARTLIST_FOREACH(votes, networkstatus_t *, v,
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 1d93ae048e..ccac458d7a 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -1077,6 +1077,9 @@ request_parse(u8 *packet, ssize_t length, struct evdns_server_port *port, struct
 	GET16(answers);
 	GET16(authority);
 	GET16(additional);
+	(void)additional;
+	(void)authority;
+	(void)answers;
 
 	if (flags & 0x8000) return -1; /* Must not be an answer. */
 	flags &= 0x0110; /* Only RD and CD get preserved. */
diff --git a/src/or/test.c b/src/or/test.c
index dc71db4e1d..2a37ab976a 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -461,7 +461,7 @@ test_crypto_rng(void)
     uint64_t big;
     char *host;
     j = crypto_rand_int(100);
-    if (i < 0 || i >= 100)
+    if (j < 0 || j >= 100)
       allok = 0;
     big = crypto_rand_uint64(U64_LITERAL(1)<<40);
     if (big >= (U64_LITERAL(1)<<40))
@@ -626,6 +626,7 @@ test_crypto_sha(void)
   /* Test SHA-1 with a test vector from the specification. */
   i = crypto_digest(data, "abc", 3);
   test_memeq_hex(data, "A9993E364706816ABA3E25717850C26C9CD0D89D");
+  test_eq(i, 0);
 
   /* Test HMAC-SHA-1 with test cases from RFC2202. */