Commit 97ed2ce0 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Unindent long-misindented blocks. 

We switched these to be "if (1) " a while back, so we could keep
the indentation and avoid merge conflicts.  But it's nice to clean
up from time to time.
parent 26651d7f

src/or/channel.c

+109 −111
Original line number Diff line number Diff line
@@ -2318,7 +2318,6 @@ channel_flush_some_cells_from_outgoing_queue(channel_t *chan, 
      free_q = 0;

      handed_off = 0;



      if (1) {

      /* Figure out how big it is for statistical purposes */

      cell_size = channel_get_cell_queue_entry_size(chan, q);

      /*
@@ -2436,7 +2435,6 @@ channel_flush_some_cells_from_outgoing_queue(channel_t *chan, 
      }

    }

  }

  }



  /* Did we drain the queue? */

  if (TOR_SIMPLEQ_EMPTY(&chan->outgoing_queue)) {

src/or/config.c

+25 −25
Original line number Diff line number Diff line
@@ -5313,7 +5313,7 @@ addressmap_register_auto(const char *from, const char *to, 
  int from_wildcard = 0, to_wildcard = 0;



  *msg = "whoops, forgot the error message";

  if (1) {



  if (!strcmp(to, "*") || !strcmp(from, "*")) {

    *msg = "can't remap from or to *";

    return -1;
@@ -5341,7 +5341,7 @@ addressmap_register_auto(const char *from, const char *to, 


  addressmap_register(from, tor_strdup(to), expires, addrmap_source,

                      from_wildcard, to_wildcard);

  }



  return 0;

}

src/or/directory.c

+69 −73
Original line number Diff line number Diff line
@@ -1857,7 +1857,7 @@ body_is_plausible(const char *body, size_t len, int purpose) 
  if (purpose == DIR_PURPOSE_FETCH_MICRODESC) {

    return (!strcmpstart(body,"onion-key"));

  }

  if (1) {



  if (!strcmpstart(body,"router") ||

      !strcmpstart(body,"network-status"))

    return 1;
@@ -1865,7 +1865,7 @@ body_is_plausible(const char *body, size_t len, int purpose) 
    if (!TOR_ISPRINT(body[i]) && !TOR_ISSPACE(body[i]))

      return 0;

  }

  }



  return 1;

}
@@ -3030,7 +3030,6 @@ handle_get_current_consensus(dir_connection_t *conn, 
    smartlist_t *dir_fps = smartlist_new();

    long lifetime = NETWORKSTATUS_CACHE_LIFETIME;



    if (1) {

    networkstatus_t *v;

    time_t now = time(NULL);

    const char *want_fps = NULL;
@@ -3086,7 +3085,6 @@ handle_get_current_consensus(dir_connection_t *conn, 
      smartlist_add(dir_fps, fp);

    }

    lifetime = (v && v->fresh_until > now) ? v->fresh_until - now : 0;

    }



    if (!smartlist_len(dir_fps)) { /* we failed to create/cache cp */

      write_http_status_line(conn, 503, "Network status object unavailable");
@@ -3122,7 +3120,6 @@ handle_get_current_consensus(dir_connection_t *conn, 
      goto done;

    }



    if (1) {

    tor_addr_t addr;

    if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) {

      geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS,
@@ -3137,7 +3134,6 @@ handle_get_current_consensus(dir_connection_t *conn, 
        geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen,

                           DIRREQ_DIRECT);

    }

    }



    write_http_response_header(conn, -1, compressed,

                               smartlist_len(dir_fps) == 1 ? lifetime : 0);