Commit 20d6f787 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Fix "make check-spaces" issues

parent 913067f7

src/common/address.c

+1 −0
Original line number Diff line number Diff line
@@ -1696,3 +1696,4 @@ tor_addr_hostname_is_local(const char *name) 
    !strcasecmp(name, "local") ||

    !strcasecmpend(name, ".local");

}

src/common/crypto.c

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ 
/** Longest recognized */

#define MAX_DNS_LABEL_SIZE 63



#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(0,9,8) && !defined(RUNNING_DOXYGEN)

#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(0,9,8) && \

  !defined(RUNNING_DOXYGEN)

/** @{ */

/** On OpenSSL versions before 0.9.8, there is no working SHA256

 * implementation, so we use Tom St Denis's nice speedy one, slightly adapted

src/or/config.c

+0 −1
Original line number Diff line number Diff line
@@ -820,7 +820,6 @@ get_short_version(void) 
  return the_short_tor_version;

}





/** Release additional memory allocated in options

 */

static void

src/or/connection_edge.c

+4 −4
Original line number Diff line number Diff line
@@ -2007,8 +2007,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, 
           * then we really don't want to try to connect to it.  That's

           * probably an error. */

          if (conn->is_transparent_ap) {

#define WARN_INTERVAL_LOOP 300

            static ratelim_t loop_warn_limit = RATELIM_INIT(WARN_INTERVAL_LOOP);

#define WARN_INTRVL_LOOP 300

            static ratelim_t loop_warn_limit = RATELIM_INIT(WARN_INTRVL_LOOP);

            char *m;

            if ((m = rate_limit_log(&loop_warn_limit, approx_time()))) {

              log_warn(LD_NET,
@@ -2019,8 +2019,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, 
              tor_free(m);

            }

          } else {

#define WARN_INTERVAL_PRIV 300

            static ratelim_t priv_warn_limit = RATELIM_INIT(WARN_INTERVAL_PRIV);

#define WARN_INTRVL_PRIV 300

            static ratelim_t priv_warn_limit = RATELIM_INIT(WARN_INTRVL_PRIV);

            char *m;

            if ((m = rate_limit_log(&priv_warn_limit, approx_time()))) {

              log_warn(LD_NET,

src/or/router.c

+2 −1
Original line number Diff line number Diff line
@@ -1954,7 +1954,8 @@ router_guess_address_from_dir_headers(uint32_t *guess) 
void

get_platform_str(char *platform, size_t len)

{

  tor_snprintf(platform, len, "Tor %s on %s", get_short_version(), get_uname());

  tor_snprintf(platform, len, "Tor %s on %s",

               get_short_version(), get_uname());

}



/* XXX need to audit this thing and count fenceposts. maybe