Commit a5232e0c authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Fix GCC 4.6's new -Wunused-but-set-variable warnings. 

Most instances were dead code; for those, I removed the assignments.
Some were pieces of info we don't currently plan to use, but which
we might in the future.  For those, I added an explicit cast-to-void
to indicate that we know that the thing's unused.  Finally, one was
a case where we were testing the wrong variable in a unit test.
That one I fixed.

This resolves bug 3208.
parent 57810c33

changes/bug3208

+2 −0
Original line number Diff line number Diff line
@@ -2,3 +2,5 @@ 
    - Remove undocumented option "-F" from tor-resolve: it hasn't done

      anything since 0.2.1.16-rc.



  o Minor bugfixes:

    - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option.

src/or/circuitbuild.c

+0 −3
Original line number Diff line number Diff line
@@ -3766,7 +3766,6 @@ void 
entry_guards_compute_status(or_options_t *options, time_t now)

{

  int changed = 0;

  int severity = LOG_DEBUG;

  digestmap_t *reasons;



  if (! entry_guards)
@@ -3793,8 +3792,6 @@ entry_guards_compute_status(or_options_t *options, time_t now) 
  if (remove_dead_entry_guards(now))

    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);

src/or/command.c

+1 −0
Original line number Diff line number Diff line
@@ -645,6 +645,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));

src/or/control.c

+0 −2
Original line number Diff line number Diff line
@@ -3142,7 +3142,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);
@@ -3166,7 +3165,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);

src/or/directory.c

+0 −2
Original line number Diff line number Diff line
@@ -1900,7 +1900,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,
@@ -1913,7 +1912,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);

          }